From 2e4a74551377079ecd1682314893da5a877cfd87 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 17 Nov 2020 20:38:32 +0100 Subject: [PATCH 1/5] Don't copy xresources --- arch-config/scripts/arcolinux-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index b536cd3d..482cf261 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/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 From 2cde09fc9bb08d2e97eb2b62f539be052543a39b Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 17 Nov 2020 21:08:23 +0100 Subject: [PATCH 2/5] Script can now be run basically any time --- arch-config/scripts/git-pull.sh | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch-config/scripts/git-pull.sh b/arch-config/scripts/git-pull.sh index 277b6130..64f37289 100644 --- a/arch-config/scripts/git-pull.sh +++ b/arch-config/scripts/git-pull.sh @@ -2,18 +2,57 @@ 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 From c737f42af9df7ca38dd81b10c37a98d5d6715ad4 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 17 Nov 2020 21:18:37 +0100 Subject: [PATCH 3/5] Make this script slightly safer --- arch-config/scripts/clean-trash.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch-config/scripts/clean-trash.sh b/arch-config/scripts/clean-trash.sh index b8c3575e..ac1ea804 100644 --- a/arch-config/scripts/clean-trash.sh +++ b/arch-config/scripts/clean-trash.sh @@ -2,5 +2,13 @@ set -euo pipefail -rm -rvf $HOME/.local/share/Trash -rm -rvf /mnt/1d90c4d5-21d2-4455-bb4a-814de8496744/.Trash-1000/ +if [ -d "$HOME/.local/share/Trash" ]; then + 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 From f0965c8a397f61d8b7a51bfa418dca8c8d7c4d71 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 17 Nov 2020 21:21:54 +0100 Subject: [PATCH 4/5] Add exit --- arch-config/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/arch-config/install.sh b/arch-config/install.sh index ff1f4953..b00ead61 100644 --- a/arch-config/install.sh +++ b/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 From 458d5b4fac7f2c4c2bfa8542f803fa2e03ef4982 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 17 Nov 2020 21:22:06 +0100 Subject: [PATCH 5/5] Add exit --- arch-config/scripts/arcolinux-config.sh | 2 ++ arch-config/scripts/git-pull.sh | 2 ++ arch-config/scripts/iommu.sh | 2 ++ arch-config/scripts/redetect-audio.sh | 2 ++ arch-config/scripts/startup.sh | 2 ++ 5 files changed, 10 insertions(+) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index 482cf261..826d7ee7 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -149,3 +149,5 @@ echo Launching new shell! #new shell to reload .bashrc and fish config exec bash + +exit 0 diff --git a/arch-config/scripts/git-pull.sh b/arch-config/scripts/git-pull.sh index 64f37289..28647d6c 100644 --- a/arch-config/scripts/git-pull.sh +++ b/arch-config/scripts/git-pull.sh @@ -56,3 +56,5 @@ fi cd "$HOME/GitProjects/website" git fetch --all git pull + +exit 0 diff --git a/arch-config/scripts/iommu.sh b/arch-config/scripts/iommu.sh index a52892aa..be04ee55 100755 --- a/arch-config/scripts/iommu.sh +++ b/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 diff --git a/arch-config/scripts/redetect-audio.sh b/arch-config/scripts/redetect-audio.sh index 1ce17153..299bef44 100644 --- a/arch-config/scripts/redetect-audio.sh +++ b/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 diff --git a/arch-config/scripts/startup.sh b/arch-config/scripts/startup.sh index 3a91951d..29deb4c0 100644 --- a/arch-config/scripts/startup.sh +++ b/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