new-update-packages-script

arch-graphical-install-auto

@@ -604,6 +604,55 @@ chmod +x /usr/bin/update-packages
 cp /opt/${repo}/default.pa /etc/pulse/default.pa
 
 
+# x11vnc
+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
+
+# .Conky
+compress restore /opt/${repo}/.Conky.tar.pxz /opt/
+chmod 755 -Rv /opt/.Conky/
+touch /root/notes.txt
+
+# Vibrancy Colors
+tar -vxJf /opt/${repo}/vibrancy-colors.tar.xz -C /usr/share/icons/
+gtk-update-icon-cache /usr/share/icons/Vibrancy-Colors-Dark/
+
+# santana
+mkdir -p /usr/share/fonts/TTF/
+tar -vxJf /opt/${repo}/santana.tar.xz -C /usr/share/fonts/TTF/
+
+# installer
+mkdir -p /usr/share/applications/
+cp /opt/${repo}/arch-install.desktop /usr/share/applications/arch-install.desktop
+
+# install-picture
+mkdir -p /usr/share/pixmaps/
+cp /opt/${repo}/install.png /usr/share/pixmaps/
+
+# background
+mkdir -p /usr/share/backgrounds/xfce/
+cp /opt/${repo}/*.jpg /usr/share/backgrounds/xfce/
+chmod 755 -Rv /usr/share/backgrounds/xfce/
+
+# grub_background
+mkdir -p /usr/share/grub/
+cp /opt/${repo}/grub_background.png /usr/share/grub/background.png
+
+
+
+
+
+
+
+
+
 
 # openvpn-reconnect
 
@@ -776,9 +825,7 @@ if [ "$version" != "lite" ] && [ "$skip" != "skip" ]; then
     cd /opt/conky
     cp cmake/ConkyBuildOptions.cmake .
 
-    sed "s|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" false)|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" true)|g;
+    sed "s|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" false)|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" true)|g;s|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" false)|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" true)|g;s|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" false)|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" true)|g" ConkyBuildOptions.cmake > cmake/ConkyBuildOptions.cmake
-    s|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" false)|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" true)|g;
-    s|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" false)|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" true)|g" ConkyBuildOptions.cmake > cmake/ConkyBuildOptions.cmake
 
     if [ -d build ];then
         rm -Rv build
@@ -791,47 +838,6 @@ if [ "$version" != "lite" ] && [ "$skip" != "skip" ]; then
 
     cd /
 
-    # x11vnc
-    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
-
-    # .Conky
-    compress restore /opt/${repo}/.Conky.tar.pxz /opt/
-    chmod 755 -Rv /opt/.Conky/
-    touch /root/notes.txt
-
-    # Vibrancy Colors
-    tar -vxJf /opt/${repo}/vibrancy-colors.tar.xz -C /usr/share/icons/
-    gtk-update-icon-cache /usr/share/icons/Vibrancy-Colors-Dark/
-
-    # santana
-    mkdir -p /usr/share/fonts/TTF/
-    tar -vxJf /opt/${repo}/santana.tar.xz -C /usr/share/fonts/TTF/
-
-    # installer
-    mkdir -p /usr/share/applications/
-    cp /opt/${repo}/arch-install.desktop /usr/share/applications/arch-install.desktop
-
-    # install-picture
-    mkdir -p /usr/share/pixmaps/
-    cp /opt/${repo}/install.png /usr/share/pixmaps/
-
-    # background
-    mkdir -p /usr/share/backgrounds/xfce/
-    cp /opt/${repo}/*.jpg /usr/share/backgrounds/xfce/
-    chmod 755 -Rv /usr/share/backgrounds/xfce/
-
-    # grub_background
-    mkdir -p /usr/share/grub/
-    cp /opt/${repo}/grub_background.png /usr/share/grub/background.png
-
     if [ "$version" != "pi" ] && [ "$packageupdate" != "skip" ]; then
         # zusatzsoftware
         su "$username" -c "aurinstaller "https://aur.archlinux.org/google-chrome.git""
@@ -852,12 +858,12 @@ if [ "$version" != "lite" ] && [ "$skip" != "skip" ]; then
             "https://github.com/tonsky/FiraCode/blob/master/distr/ttf/FiraCode-${type}.ttf?raw=true";
     done
 
-
-fi
-
     echo "Kopiere Config zum User"
     copyconfig
 
+
+fi
+
 if pacman -Qdtq; then
     echo "Verwaiste Packete werden entfernt :)"
     pacman -Rsn $(pacman -Qdtq) --noconfirm

update-packages

@@ -40,6 +40,8 @@ function standartinstallation() {
     pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm --ignore linux
 }
 
-standartinstallation
+#standartinstallation
+
+/opt/${repo}/arch-graphical-install-auto "${version}" "${2}" "${3}" "skip" ""
 
 echo "Fertig!!!"

update.sh

@@ -47,7 +47,7 @@ then
                 echo "Git is not installet"
                 pacman -S git --needed --noconfirm
             fi
-            /opt/${repo}/arch-graphical-install-auto "${version}" "$2" "$3" "skip" "$4"
+            /opt/${repo}/arch-graphical-install-auto "${version}" "${2}" "${3}"
             read -p "Aktualisierung erfolgreich Abgeschlossen. Wollen sie den PC NEUSTARTEN?: [Y/n] " sicherheitsabfrage
             if [ "$sicherheitsabfrage" != "n" ]
             then