Merge branch 'master' of gitlab.com:RealStickman-arcolinux/config

arch-config/install.sh

@@ -12,3 +12,4 @@ echo Launching arcolinux-config.sh
 #make executable & launch arcolinux-config.sh
 chmod +x ~/config/scripts/arcolinux-config.sh
 bash ~/config/scripts/arcolinux-config.sh
+exit 0

arch-config/scripts/arcolinux-config.sh

@@ -106,7 +106,7 @@ sudo cp -r ~/config/var /
 sudo cp -r ~/config/usr /
 
 # copy xresources
-cp ~/config/.Xresources ~/
+#cp ~/config/.Xresources ~/
 
 #gimp plugins
 mkdir ~/.config/GIMP/ || echo Not creating directory
@@ -149,3 +149,5 @@ echo Launching new shell!
 
 #new shell to reload .bashrc and fish config
 exec bash
+
+exit 0

arch-config/scripts/clean-trash.sh

@@ -2,5 +2,13 @@
 
 set -euo pipefail
 
-rm -rvf $HOME/.local/share/Trash
+if [ -d "$HOME/.local/share/Trash" ]; then
-rm -rvf /mnt/1d90c4d5-21d2-4455-bb4a-814de8496744/.Trash-1000/
+    rm -rvf "$HOME/.local/share/Trash"
+fi
+
+if [ -d "/mnt/1d90c4d5-21d2-4455-bb4a-814de8496744/.Trash-1000/" ]; then
+    rm -rvf /mnt/1d90c4d5-21d2-4455-bb4a-814de8496744/.Trash-1000/
+fi
+
+
+exit 0

arch-config/scripts/git-pull.sh

@@ -2,18 +2,59 @@
 
 set -euo pipefail
 
+if [ ! -d "$HOME/GitProjects" ]; then
+    mkdir "$HOME/GitProjects"
+fi
+
+WORKPATH="$HOME/GitProjects"
+
+if [ ! -d "$HOME/GitProjects/config" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman-arcolinux/config.git
+fi
 cd "$HOME/GitProjects/config"
 git fetch --all
 git pull
 
+if [ ! -d "$HOME/GitProjects/ffmpeg-lower-vol" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman/ffmpeg-lower-vol.git
+fi
+cd "$HOME/GitProjects/ffmpeg-lower-vol"
+git fetch --all
+git pull
+
+if [ ! -d "$HOME/GitProjects/grab" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman/grab.git
+fi
 cd "$HOME/GitProjects/grab"
 git fetch --all
 git pull
 
+if [ ! -d "$HOME/GitProjects/powershell-scripting" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman/powershell-scripting.git
+fi
+cd "$HOME/GitProjects/powershell-scripting"
+git fetch --all
+git pull
+
+if [ ! -d "$HOME/GitProjects/setup" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman-arcolinux/setup.git
+fi
 cd "$HOME/GitProjects/setup"
 git fetch --all
 git pull
 
+if [ ! -d "$HOME/GitProjects/setup-pinephone" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman/setup-pinephone.git
+fi
 cd "$HOME/GitProjects/setup-pinephone"
 git fetch --all
 git pull
+
+if [ ! -d "$HOME/GitProjects/website" ]; then
+    git -C $WORKPATH clone git@gitlab.com:RealStickman/website.git
+fi
+cd "$HOME/GitProjects/website"
+git fetch --all
+git pull
+
+exit 0

arch-config/scripts/iommu.sh

@@ -9,3 +9,5 @@ for g in /sys/kernel/iommu_groups/*; do
         echo -e "\t$(lspci -nns ${d##*/})"
     done;
 done;
+
+exit 0

arch-config/scripts/redetect-audio.sh

@@ -4,3 +4,5 @@ set -euo pipefail
 
 # redetects PulseAudio outputs
 pacmd unload-module module-udev-detect && pacmd load-module module-udev-detect
+
+exit 0

arch-config/scripts/startup.sh

@@ -7,3 +7,5 @@ pacmd unload-module module-udev-detect && pacmd load-module module-udev-detect
 
 # Git pull
 bash "$HOME/scripts/git-pull.sh"
+
+exit 0