This commit is contained in:
bferturk
2016-05-27 22:06:42 +03:00
parent fa16207d9b
commit cbb02855bc
12 changed files with 3 additions and 3 deletions
@@ -0,0 +1,14 @@
[Desktop Entry]
Type=Application
Version=1.0
Name=Pisi Linux — System Installer
Name[tr_TR]=Pisi Linux Sistem Yükleyici
Comment=Pisi Linux — System Installer
Comment[tr_TR]=Pisi Linux Sistem Yükleyici
Exec=sudo LC_ALL=en_US calamares %f
Icon=calamares
Terminal=false
StartupNotify=true
Type=Application
Categories=Qt;System;
@@ -0,0 +1,13 @@
ca_ES.UTF-8
de_DE.UTF-8
en_US.UTF-8
es_ES.UTF-8
fr_FR.UTF-8
hu_HU.UTF-8
it_IT.UTF-8
nl_NL.UTF-8
pl_PL.UTF-8
pt_BR.UTF-8
ru_RU.UTF-8
sv_SE.UTF-8
tr_TR.UTF-8
@@ -0,0 +1,75 @@
--- calamares-2.2.orig/src/modules/mudur/main.py 1970-01-01 02:00:00.000000000 +0200
+++ calamares-2.2/src/modules/mudur/main.py 2016-05-27 21:36:09.787035345 +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
--- calamares-2.2.orig/src/modules/mudur/module.desc 1970-01-01 02:00:00.000000000 +0200
+++ calamares-2.2/src/modules/mudur/module.desc 2016-05-18 10:22:05.000000000 +0300
@@ -0,0 +1,5 @@
+---
+type: "job"
+name: "mudur"
+interface: "python"
+script: "main.py"
@@ -0,0 +1,21 @@
--- calamares-2.2.orig/src/modules/locale/LocalePage.cpp 2015-08-06 12:58:34.000000000 +0300
+++ calamares-2.2/src/modules/locale/LocalePage.cpp 2016-05-18 10:19:14.271694185 +0300
@@ -240,7 +240,7 @@
<< ". Assuming the supported languages are already built into "
"the locale archive.";
QProcess localeA;
- localeA.start( "locale", QStringList() << "-a" );
+ localeA.start( "cat", QStringList() << "/etc/languages" );
localeA.waitForFinished();
ba = localeA.readAllStandardOutput();
}
--- calamares-2.2.orig/src/modules/localecfg/main.py 2015-10-16 17:56:51.000000000 +0300
+++ calamares-2.2/src/modules/localecfg/main.py 2016-05-18 10:19:38.315696547 +0300
@@ -67,6 +67,6 @@
with open(locale_conf_path, "w") as locale_conf:
locale_split = locale.split(' ')[0]
- locale_conf.write("LANG={!s}\n".format(locale_split))
+ locale_conf.write("{!s}\n".format(locale_split))
return None
@@ -0,0 +1,20 @@
--- calamares-2.2.orig/src/modules/users/SetHostNameJob.cpp 2015-08-06 12:58:32.000000000 +0300
+++ calamares-2.2/src/modules/users/SetHostNameJob.cpp 2016-05-17 01:02:30.131263802 +0300
@@ -68,7 +68,7 @@
return Calamares::JobResult::error( tr( "Internal Error" ) );
}
- QFile hostfile( destDir + "/etc/hostname" );
+ QFile hostfile( destDir + "/etc/env.d/01hostname" );
if ( !hostfile.open( QFile::WriteOnly ) )
{
cLog() << "Can't write to hostname file";
@@ -76,7 +76,7 @@
}
QTextStream hostfileout( &hostfile );
- hostfileout << m_hostname << "\n";
+ hostfileout << "HOSTNAME=" << "\"" << m_hostname << "\"" << "\n";
hostfile.close();
QFile hostsfile( destDir + "/etc/hosts" );