From c85d043aad8240a02e3de2b6be342ff5a16e6d8b Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sat, 11 Nov 2017 15:22:16 +0300
Subject: [PATCH] calamares:ver.bump

---
 system/installer/Calamares/files/d.patch | 57 ++++++++++++++++++++++++
 system/installer/Calamares/pspec.xml     |  6 +--
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 system/installer/Calamares/files/d.patch

diff --git a/system/installer/Calamares/files/d.patch b/system/installer/Calamares/files/d.patch
new file mode 100644
index 0000000000..6e89baca14
--- /dev/null
+++ b/system/installer/Calamares/files/d.patch
@@ -0,0 +1,57 @@
+diff -Nuar calamares-3.1.7/settings.conf calamares-3.1.70/settings.conf
+--- calamares-3.1.7/settings.conf	2017-10-24 14:46:03.000000000 +0300
++++ calamares-3.1.70/settings.conf	2017-11-10 14:46:45.564199238 +0300
+@@ -77,7 +77,7 @@
+   - unpackfs
+   - machineid
+   - fstab
+-  - locale
++  
+   - keyboard
+   - localecfg
+ #  - luksbootkeyfile
+@@ -92,6 +92,7 @@
+   - hwclock
+   - services
+ #  - dracut
++  - locale
+   - initramfs
+ #  - grubcfg
+   - bootloader
+diff -Nuar calamares-3.1.7/src/modules/localecfg/main.py calamares-3.1.70/src/modules/localecfg/main.py
+--- calamares-3.1.7/src/modules/localecfg/main.py	2017-10-24 14:46:03.000000000 +0300
++++ calamares-3.1.70/src/modules/localecfg/main.py	2017-11-11 02:08:45.927006326 +0300
+@@ -80,16 +80,22 @@
+         print('locale.gen done')
+ 
+     # write /etc/locale.conf
+-    locale_conf_path = os.path.join(install_path, "etc/locale.conf")
+-    with open(locale_conf_path, "w") as lcf:
++   
++    with open("{!s}/etc/mudur/locale".format(install_path), "w") as lcf:
++        lcf.write("{}".format(locale_conf['LANG']))
++    with open("{!s}/etc/mudur/language".format(install_path), "w") as langcf:
++        langcf.write("{}".format(locale_conf['LANG'].split("_")[0]))
++    with open("{!s}/etc/mudur/keymap".format(install_path), "w") as keymapcf:
++        keymapcf.write("{}".format(locale_conf['LANG'].split("_")[0]))
++    # write /etc/default/locale if /etc/default exists and is a di
++    with open("{!s}/etc/env.d/03locale".format(install_path), "w") as edl:
+         for k, v in locale_conf.items():
+-            lcf.write("{!s}={!s}\n".format(k, v))
+-
+-    # write /etc/default/locale if /etc/default exists and is a dir
+-    etc_default_path = os.path.join(install_path, "etc/default")
+-    if os.path.isdir(etc_default_path):
+-        with open(os.path.join(etc_default_path, "locale"), "w") as edl:
+-            for k, v in locale_conf.items():
+-                edl.write("{!s}={!s}\n".format(k, v))
+-
++            edl.write("{!s}={!s}\n".format(k, v))
++    with open("{!s}/etc/conf.d/mudur".format(install_path), "r+") as mcf:
++        read_lines = mcf.readlines()
++        for line in read_lines:
++            if line[:11] == "# language=":
++                  mcf.write('# language="{}"'.format(locale_conf['LANG'].split("_")[0]))
++            else:
++                mcf.write(line)
+     return None
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index 6bdd6d5c04..f484691327 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -54,7 +54,7 @@
         <Patches>
             <Patch level="1">pisi_locale.patch</Patch>
             <Patch level="1">pisi_set_hostname.patch</Patch>
-<!--             <Patch level="1">mudur_module.patch</Patch> -->
+            <Patch level="1">d.patch</Patch>
             <Patch level="1">no_fsck_and_pymouth.patch</Patch>
       </Patches>
     </Source>
@@ -110,13 +110,13 @@
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/calamares.desktop">calamares.desktop</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/etc/languages">languages</AdditionalFile>
+<!--             <AdditionalFile owner="root" permission="0644" target="/etc/languages">languages</AdditionalFile> -->
         </AdditionalFiles>
     </Package>
     
     <History>
         <Update release="5">
-            <Date>2016-12-13</Date>
+            <Date>2017-11-11</Date>
             <Version>3.1.7</Version>
             <Comment>Version Bump.</Comment>
             <Name>Mustafa Cinasal</Name>