Merge pull request #4316 from Rmys/master

calamares:ver.bump
This commit is contained in:
Rmys
2017-12-27 10:49:19 +03:00
committed by GitHub
2 changed files with 76 additions and 11 deletions
@@ -1,7 +1,7 @@
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 @@
--- a/src/modules/localecfg/main.py 2017-12-20 12:22:06.000000000 +0300
+++ b/src/modules/localecfg/main.py 2017-12-26 21:20:05.000000000 +0300
@@ -83,7 +83,7 @@
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():
@@ -10,13 +10,6 @@ diff -Nuar a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py
# 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
@@ -94,3 +87,66 @@ diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc
+name: "mudur"
+interface: "python"
+script: "main.py"
diff -Nuar a/src/modules/sil/main.py b/src/modules/sil/main.py
--- a/src/modules/sil/main.py 1970-01-01 02:00:00.000000000 +0200
+++ b/src/modules/sil/main.py 2017-12-26 21:55:01.000000000 +0300
@@ -0,0 +1,50 @@
+#!/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/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)
+
+ 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"
+10 -1
View File
@@ -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="9932d4941625de41583c28511491c93600a86b24" type="targz">https://github.com/calamares/calamares/releases/download/v3.1.10/calamares-3.1.10.tar.gz</Archive>
<Archive sha1sum="a0c1cdca859b565b1feb1b5bf4befa8983d801fd" type="targz">https://github.com/calamares/calamares/releases/download/v3.1.11/calamares-3.1.11.tar.gz</Archive>
<BuildDependencies>
<Dependency>gettext-devel</Dependency>
<Dependency>yaml-cpp</Dependency>
@@ -50,6 +50,7 @@
<Dependency>kservice-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kparts-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">pisilocalayar.patch</Patch>
@@ -96,6 +97,7 @@
<Dependency>kservice</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kparts</Dependency>
<Dependency>kpackage</Dependency>
<Dependency>calamares-theme-pisilinux</Dependency>
</RuntimeDependencies>
<Files>
@@ -116,6 +118,13 @@
</Package>
<History>
<Update release="8">
<Date>2017-12-27</Date>
<Version>3.1.11</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2017-12-19</Date>
<Version>3.1.10</Version>