From f61b267487b32c1d4560035f2ebbaeaa454d3b6d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sun, 31 Dec 2017 15:26:29 +0300
Subject: [PATCH] calamares

---
 .../Calamares/files/pisilocalayar.patch       | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch
index 73a022773f..b62c166345 100644
--- a/system/installer/Calamares/files/pisilocalayar.patch
+++ b/system/installer/Calamares/files/pisilocalayar.patch
@@ -89,8 +89,8 @@ diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc
 +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 @@
++++ b/src/modules/sil/main.py	2017-12-31 15:05:16.622215846 +0300
+@@ -0,0 +1,53 @@
 +#!/usr/bin/env python3
 +# -*- coding: utf-8 -*-
 +#
@@ -119,28 +119,31 @@ diff -Nuar a/src/modules/sil/main.py b/src/modules/sil/main.py
 +
 +
 +
++
 +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
++   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)
++   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