pisilocalayar.patch

system/installer/Calamares/files/pisilocalayar.patch

@@ -1,19 +1,7 @@
-diff -Nuar a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py
+diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py
---- a/src/modules/localecfg/main.py	2017-12-20 12:22:06.000000000 +0300
+--- calamares-3.2-rc3/src/modules/mudur/main.py	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/modules/localecfg/main.py	2017-12-26 21:20:05.000000000 +0300
++++ calamares-3.2-rc31/src/modules/mudur/main.py	2018-03-03 16:47:21.000000000 -0500
-@@ -83,7 +83,7 @@
+@@ -0,0 +1,66 @@
-     locale_conf_path = os.path.join(install_path, "etc/locale.conf")
-     with open(locale_conf_path, "w") as lcf:
-         for k, v in locale_conf.items():
--            lcf.write("{!s}={!s}\n".format(k, v))
-+            lcf.write("{!s}\n".format(v))
- 
-     # write /etc/default/locale if /etc/default exists and is a dir
-     etc_default_path = os.path.join(install_path, "etc/default")
-diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
---- a/src/modules/mudur/main.py	1970-01-01 02:00:00.000000000 +0200
-+++ b/src/modules/mudur/main.py	2017-11-25 06:15:16.000000000 +0300
-@@ -0,0 +1,64 @@
 +#!/usr/bin/env python3
 +# -*- coding: utf-8 -*-
 +#
@@ -50,8 +38,10 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
 +    path = os.path.join(install_path, "etc/locale.conf")
 +    
 +    mloc = open(path,"r")
-+    
++    a=mloc.readline()
-+    languages = mloc.readline(2)
++    b=a.split("=")[1]
++   
++    languages = b.split("_")[0]
 +
 +  
 +    mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur")
@@ -78,78 +68,49 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py
 +    libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers'])
 +
 +    return None
-diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc
+diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc
---- a/src/modules/mudur/module.desc	1970-01-01 02:00:00.000000000 +0200
+--- calamares-3.2-rc3/src/modules/mudur/module.desc	1969-12-31 19:00:00.000000000 -0500
-+++ b/src/modules/mudur/module.desc	2016-05-09 14:24:30.000000000 +0300
++++ calamares-3.2-rc31/src/modules/mudur/module.desc	2018-02-24 08:15:23.000000000 -0500
 @@ -0,0 +1,5 @@
 +---
 +type:       "job"
 +name:       "mudur"
 +interface:  "python"
 +script:     "main.py"
-diff -Nuar a/src/modules/sil/main.py b/src/modules/sil/main.py
+diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src/modules/packages/main.py
---- a/src/modules/sil/main.py	1970-01-01 02:00:00.000000000 +0200
+--- calamares-3.2-rc3/src/modules/packages/main.py	2018-01-30 05:26:29.000000000 -0500
-+++ b/src/modules/sil/main.py	2017-12-31 15:05:16.622215846 +0300
++++ calamares-3.2-rc31/src/modules/packages/main.py	2018-03-03 16:45:20.000000000 -0500
-@@ -0,0 +1,53 @@
+@@ -267,17 +267,17 @@
-+#!/usr/bin/env python3
+         check_target_env_call(["emerge", "--sync"])
-+# -*- coding: utf-8 -*-
+ 
-+#
+ 
-+# === This file is part of Calamares - <http://github.com/calamares> ===
+-class PMEntropy(PackageManager):
-+#
+-    backend = "entropy"
-+#   Copyright 2014, Anke Boersma <demm@kaosx.us>
++class PMpisi(PackageManager):
-+#   Copyright 2015, Philip Müller <philm@manjaro.org>
++    backend = "pisi"
-+#
+ 
-+#   Calamares is free software: you can redistribute it and/or modify
+     def install(self, pkgs, from_local=False):
-+#   it under the terms of the GNU General Public License as published by
+-        check_target_env_call(["equo", "i"] + pkgs)
-+#   the Free Software Foundation, either version 3 of the License, or
++        check_target_env_call(["pisi", "it"] + pkgs)
-+#   (at your option) any later version.
+ 
-+#
+     def remove(self, pkgs):
-+#   Calamares is distributed in the hope that it will be useful,
+-        check_target_env_call(["equo", "rm"] + pkgs)
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++        check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs)
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ 
-+#   GNU General Public License for more details.
+     def update_db(self):
-+#
+-        check_target_env_call(["equo", "update"])
-+#   You should have received a copy of the GNU General Public License
++        pass
-+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ 
-+
+ 
-+import os
+ class PMDummy(PackageManager):
-+import shutil
+diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp
-+
+--- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp	2018-01-30 05:26:29.000000000 -0500
-+import libcalamares
++++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp	2018-03-03 18:03:42.451021124 -0500
-+
+@@ -31,6 +31,7 @@
-+
+     m_passphraseLineEdit->hide();
-+
+     m_confirmLineEdit->hide();
-+
+     m_iconLabel->hide();
-+def run():
++    m_encryptCheckBox->hide();
-+
+ 
-+   install_path = libcalamares.globalstorage.value("rootMountPoint")
+     connect( m_encryptCheckBox, &QCheckBox::stateChanged,
-+   
+              this, &EncryptWidget::onCheckBoxStateChanged );
-+   
-+   path = os.path.join(install_path, "etc/calamares")
-+   if os.path.exists(path):
-+        shutil.rmtree(path)
-+   path1 = os.path.join(install_path, "usr/lib/calamares")
-+   if os.path.exists(path1):
-+        shutil.rmtree(path1)
-+   path2 = os.path.join(install_path, "usr/bin/calamares")
-+   if os.path.exists(path2):
-+        os.remove(path2)
-+   path3 = os.path.join(install_path, "usr/share/man/man8/calamares.8")
-+   if os.path.exists(path3):
-+        os.remove(path3)
-+   path4 = os.path.join(install_path, "usr/share/applications/calamares.desktop")
-+   if os.path.exists(path4):
-+        os.remove(path4)
-+   path5 = os.path.join(install_path, "usr/share/calamares")
-+   if os.path.exists(path5):
-+        shutil.rmtree(path5)        
-+   return None
-diff -Nuar a/src/modules/sil/module.desc b/src/modules/sil/module.desc
---- a/src/modules/sil/module.desc	1970-01-01 02:00:00.000000000 +0200
-+++ b/src/modules/sil/module.desc	2017-12-26 21:21:52.000000000 +0300
-@@ -0,0 +1,5 @@
-+---
-+type:       "job"
-+name:       "sil"
-+interface:  "python"
-+script:     "main.py"