fix

arch-graphical-install-auto

@@ -149,22 +149,6 @@ function ldconfigcache() {
     ldconfig
 }
 
-function check() {
-    if [ -f /usr/lib/systemd/system/x11vnc.service ]; then
-        rm /usr/lib/systemd/system/x11vnc.service
-    fi
-    if [ -f /etc/systemd/system/x11vnc.service ]; then
-        rm /etc/systemd/system/x11vnc.service
-    fi
-}
-
-function checkend() {
-    cp /opt/${repo}/x11vnc.service /etc/systemd/system/x11vnc.service
-    chmod 644 /etc/systemd/system/x11vnc.service
-    systemctl enable x11vnc.service
-
-}
-
 function addusers() {
     useradd -m -g users -G wheel,audio,video,sys,optical -s /bin/bash $username
     passwd ${username} <<EOT
@@ -345,14 +329,9 @@ if [ -f /var/lib/pacman/db.lck ];then
 fi
 
 # vollinstallation
-if [ "$vollinstallation" != "n" ]
-then
-    check
 if [ "$vollinstallation" != "debug" ]; then
   standartinstallation
 fi
-    checkend
-fi
 
 echo "Packetliste2 Ende"
 echo "Beginne mit dem Konfigurieren des Systems :D"
@@ -436,7 +415,17 @@ else
     echo "Kein Start gewählt!!!"
 fi
 
-if [ "${vollinstallation}" != "n" ]; then
+if [ "${version}" != "lite" ]; then
+    if [ -f /usr/lib/systemd/system/x11vnc.service ]; then
+        rm /usr/lib/systemd/system/x11vnc.service
+    fi
+    if [ -f /etc/systemd/system/x11vnc.service ]; then
+        rm /etc/systemd/system/x11vnc.service
+    fi
+    cp /opt/${repo}/x11vnc.service /etc/systemd/system/x11vnc.service
+    chmod 644 /etc/systemd/system/x11vnc.service
+    systemctl enable x11vnc.service
+fi
 systemctl enable acpid
 systemctl enable ntpd
 systemctl enable avahi-daemon
@@ -455,7 +444,6 @@ if [ "${vollinstallation}" != "n" ]; then
 systemctl enable fail2ban
 systemctl disable dhcpcd
 systemctl enable NetworkManager.service
-fi
 
 # set systemconfiguration
 echo "systemconfiguration"
@@ -481,7 +469,7 @@ ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 
 # custom-bereich vollinstallation
 
-if [ "${vollinstallation}" != "n" ]; then
+if [ "$version" != "lite" ]; then
 
     # custom-installer
 
@@ -564,6 +552,7 @@ if [ "${vollinstallation}" != "n" ]; then
 
     cd /
 
+fi
 # iso_name
 echo "${repo}-${version}" > /etc/hostname
 
@@ -581,13 +570,7 @@ if [ "${vollinstallation}" != "n" ]; then
 
 # installer
 mkdir -p /usr/share/applications/
-    mkdir -p /root/.config/xfce4/panel/launcher-29/
+cp /opt/${repo}/arch-install.desktop > /usr/share/applications/arch-install.desktop
-    sed "s|%VERSION%|${version}|g;" /opt/${repo}/arch-install.desktop > /usr/share/applications/arch-install.desktop
-    sed "s|%VERSION%|${version}|g;" /opt/${repo}/15196212071.desktop > /root/.config/xfce4/panel/launcher-29/15196212071.desktop
-    sed "s|%VERSION%|${version}|g;" /opt/${repo}/15196212512.desktop > /root/.config/xfce4/panel/launcher-29/15196212512.desktop
-    chmod 755 /usr/share/applications/arch-install.desktop
-    chmod 755 /root/.config/xfce4/panel/launcher-29/15196212071.desktop
-    chmod 755 /root/.config/xfce4/panel/launcher-29/15196212512.desktop
 
 # install-picture
 mkdir -p /usr/share/pixmaps/
@@ -671,8 +654,6 @@ if [ "${vollinstallation}" != "n" ]; then
 # XDG standard
 cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list
 
-fi
-
 
 
 # custom-bereich standart

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 "" %VERSION%
+Exec=/usr/bin/arch-install
 Terminal=true
 Categories=ConsoleOnly;System;
 StartupNotify=false