Rmys
GitHub
@@ -0,0 +1,96 @@
|
||||
diff -Nuar a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py
|
||||
--- a/src/modules/localecfg/main.py 2017-11-29 16:58:32.000000000 +0300
|
||||
+++ b/src/modules/localecfg/main.py 2017-12-19 17:15:30.000000000 +0300
|
||||
@@ -83,13 +83,13 @@
|
||||
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")
|
||||
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}\n".format(v))
|
||||
|
||||
return None
|
||||
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 -*-
|
||||
+#
|
||||
+# === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
+#
|
||||
+# Copyright 2014, Anke Boersma <demm@kaosx.us>
|
||||
+# Copyright 2015, Philip Müller <philm@manjaro.org>
|
||||
+#
|
||||
+# Calamares is free software: you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation, either version 3 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+#
|
||||
+# Calamares is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+import os
|
||||
+import shutil
|
||||
+
|
||||
+import libcalamares
|
||||
+
|
||||
+
|
||||
+
|
||||
+def run():
|
||||
+
|
||||
+ install_path = libcalamares.globalstorage.value("rootMountPoint")
|
||||
+
|
||||
+
|
||||
+ path = os.path.join(install_path, "etc/locale.conf")
|
||||
+
|
||||
+ mloc = open(path,"r")
|
||||
+
|
||||
+ languages = mloc.readline(2)
|
||||
+
|
||||
+
|
||||
+ mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur")
|
||||
+ lines = []
|
||||
+ for l in open(mudur_file_path, "r").readlines():
|
||||
+ if l.strip().startswith('language=') or l.strip().startswith('# language='):
|
||||
+ if languages == "pt":
|
||||
+ l = 'language="pt_BR"\n'
|
||||
+ else:
|
||||
+ l = 'language="%s"\n' % languages
|
||||
+ lines.append(l)
|
||||
+
|
||||
+ open(mudur_file_path, "w").writelines(lines)
|
||||
+
|
||||
+ if os.path.exists(os.path.join(install_path, "etc/sudoers")):
|
||||
+ os.unlink(os.path.join(install_path, "etc/sudoers"))
|
||||
+
|
||||
+
|
||||
+ source = os.path.join(install_path, "etc/sudoers.orig")
|
||||
+ target = os.path.join(install_path, "etc/sudoers")
|
||||
+
|
||||
+ shutil.copy(source, target)
|
||||
+
|
||||
+ 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
|
||||
--- a/src/modules/mudur/module.desc 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ b/src/modules/mudur/module.desc 2016-05-09 14:24:30.000000000 +0300
|
||||
@@ -0,0 +1,5 @@
|
||||
+---
|
||||
+type: "job"
|
||||
+name: "mudur"
|
||||
+interface: "python"
|
||||
+script: "main.py"
|
||||
@@ -11,7 +11,7 @@
|
||||
<License>LGPLv2</License>
|
||||
<Summary>A distribution independent installer framework</Summary>
|
||||
<Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
|
||||
<Archive sha1sum="a7a9f203def3aa15ffb134db4725d87fa03a8324" type="zip">https://sourceforge.net/projects/pisilinux/files/source/calamares-3.1.7.zip</Archive>
|
||||
<Archive sha1sum="9932d4941625de41583c28511491c93600a86b24" type="targz">https://github.com/calamares/calamares/releases/download/v3.1.10/calamares-3.1.10.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>yaml-cpp</Dependency>
|
||||
@@ -52,7 +52,7 @@
|
||||
<Dependency>kparts-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--Patch level="1">pisi_locale.patch</Patch-->
|
||||
<Patch level="1">pisilocalayar.patch</Patch>
|
||||
<Patch level="1">pisi_set_hostname.patch</Patch>
|
||||
<!-- <Patch level="1">d.patch</Patch> -->
|
||||
<Patch level="1">no_fsck_and_pymouth.patch</Patch>
|
||||
@@ -66,6 +66,7 @@
|
||||
<Dependency versionFrom="1.60">boost</Dependency>
|
||||
<Dependency versionFrom="1.60">boost-python3</Dependency>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>kcrash</Dependency>
|
||||
<Dependency>parted</Dependency>
|
||||
<Dependency>solid</Dependency>
|
||||
<Dependency>ki18n</Dependency>
|
||||
@@ -117,8 +118,8 @@
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2017-12-19</Date>
|
||||
<Version>3.1.7</Version>
|
||||
<Comment>Rebuild partitionmanager.</Comment>
|
||||
<Version>3.1.10</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
|
||||
Reference in New Issue
Block a user