From b3eda455ee87fbf47481239ec9d43f06eeb57e31 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Fri, 6 Apr 2018 16:43:26 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto |  8 ++------
 arch-install                |  1 -
 arch-install-libre.desktop  | 11 -----------
 arch-install.desktop        |  2 +-
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100755 arch-install-libre.desktop

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 3d4bdf8..8abf09a 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -580,16 +580,12 @@ if [ "${vollinstallation}" != "n" ]; then
     chmod 755 /usr/bin/write_cowspace
 
     # installer-/usr/bin/
-    sed "s|%VERSION%|${version}|g;" /opt/${repo}/arch-install > /usr/bin/arch-install
+    cp /opt/${repo}/arch-install /usr/bin/arch-install
     chmod 755 /usr/bin/arch-install
 
     # installer
     mkdir -p /usr/share/applications/
-    if [ "${version}" == "libre" ]; then
-      cp /opt/${repo}/arch-install-libre.desktop /usr/share/applications/arch-install.desktop
-    else
-      cp /opt/${repo}/arch-install.desktop /usr/share/applications/arch-install.desktop
-    fi
+    sed "s|%VERSION%|${version}|g;" /opt/${repo}/arch-install.desktop > /usr/share/applications/arch-install.desktop
     chmod 755 /usr/share/applications/arch-install.desktop
 
     # install-picture
diff --git a/arch-install b/arch-install
index 6450871..337d309 100755
--- a/arch-install
+++ b/arch-install
@@ -7,7 +7,6 @@ echo "Version : DI 27. Feb 22:52:41 CET 2017"
 WEBADDRESS="https://github.com/simono41/SpectreOS.git"
 repo="SpectreOS"
 user="user1"
-version="%VERSION%"
 
 [[ -n "${2}" ]] && version="${2}" || version=voll
 
diff --git a/arch-install-libre.desktop b/arch-install-libre.desktop
deleted file mode 100755
index e633893..0000000
--- a/arch-install-libre.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Icon=/usr/share/pixmaps/install.png
-Name[de]=Betriebssystem installieren
-Name[en]=Install the operating system
-Exec=/usr/bin/arch-install "" libre
-Terminal=true
-Categories=ConsoleOnly;System;
-StartupNotify=false
-Comment=
-Path=
diff --git a/arch-install.desktop b/arch-install.desktop
index 190d072..fde0055 100755
--- a/arch-install.desktop
+++ b/arch-install.desktop
@@ -3,7 +3,7 @@ Type=Application
 Icon=/usr/share/pixmaps/install.png
 Name[de]=Betriebssystem installieren
 Name[en]=Install the operating system
-Exec=/usr/bin/arch-install
+Exec=/usr/bin/arch-install "" %VERSION%
 Terminal=true
 Categories=ConsoleOnly;System;
 StartupNotify=false