From 033fb2a62842885b02d5f0482d96aaef2c8974d8 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Tue, 21 Aug 2018 19:18:50 -0400
Subject: [PATCH] fix

---
 make_mksquashfs-auto.sh |  6 +++++-
 update-packages         | 27 ++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 98c61a1..1ad5a6e 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -143,6 +143,10 @@ function system() {
             echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
             echo "install dell-smbios /bin/false" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-dell-smbios.conf
 
+            if [ "${version}" != "manjaro" ]; then
+              plymouth=plymouth
+            fi
+
             if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
                 echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "HOOKS=\"base udev archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
@@ -151,7 +155,7 @@ function system() {
 
             else
                 echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
-                echo "HOOKS=\"base udev archiso block filesystems keyboard plymouth\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+                echo "HOOKS=\"base udev archiso block filesystems keyboard ${plymouth}\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
 
diff --git a/update-packages b/update-packages
index 509379d..9a12894 100755
--- a/update-packages
+++ b/update-packages
@@ -12,12 +12,29 @@ echo "Als root Angemeldet"
 hostname="$(cat /etc/hostname)"
 [[ -z "${version}" ]] && version="${hostname#*-}"
 
+WEBADDRESS="ssh://git@5.83.162.84:22/home/git/SpectreOS"
+WEBADDRESS1="ssh://git@5.83.162.84:22/home/git/shell-scripte"
+
 repo=SpectreOS
 repo1=shell-scripte
 
-cd /opt/${repo}
-git reset --hard
-git pull
+if [ -d "/opt/${repo}" ]; then
+    echo "${repo} existiert bereits!!!"
+    cd /opt/${repo}
+    git reset --hard
+    git pull
+else
+    git clone ${WEBADDRESS} /opt/${repo}
+fi
+if [ -d "/opt/${repo1}" ]; then
+    echo "${repo1} existiert bereits!!!"
+    cd /opt/${repo1}
+    git reset --hard
+    git pull
+else
+    git clone ${WEBADDRESS1} /opt/${repo1}
+fi
+cd /
 
 function standartinstallation() {
     pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm --ignore linux
@@ -25,8 +42,4 @@ function standartinstallation() {
 
 standartinstallation
 
-cd /opt/${repo1}
-git reset --hard
-git pull
-
 echo "Fertig!!!"