From 37f4c9a46a4cc5f01de0be05d13eae1dac684d82 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 19:44:29 +0200 Subject: [PATCH 1/7] Added git fetch --all --- arch-config/scripts/git-pull.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch-config/scripts/git-pull.sh b/arch-config/scripts/git-pull.sh index bbcfc932..277b6130 100644 --- a/arch-config/scripts/git-pull.sh +++ b/arch-config/scripts/git-pull.sh @@ -2,14 +2,18 @@ set -euo pipefail -cd "$HOME/GitProjects/config" || exit +cd "$HOME/GitProjects/config" +git fetch --all git pull -cd "$HOME/GitProjects/grab" || exit +cd "$HOME/GitProjects/grab" +git fetch --all git pull -cd "$HOME/GitProjects/setup" || exit +cd "$HOME/GitProjects/setup" +git fetch --all git pull -cd "$HOME/GitProjects/setup-pinephone" || exit +cd "$HOME/GitProjects/setup-pinephone" +git fetch --all git pull From 1729bb62bd17b182a860a1628d4d1c5dc403186f Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 19:53:09 +0200 Subject: [PATCH 2/7] polybar date label --- arch-config/.config/polybar/modules/date.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-config/.config/polybar/modules/date.ini b/arch-config/.config/polybar/modules/date.ini index 29e5424c..9d428ca9 100644 --- a/arch-config/.config/polybar/modules/date.ini +++ b/arch-config/.config/polybar/modules/date.ini @@ -15,4 +15,4 @@ format-prefix-foreground = ${colors.orange} format-underline = ${colors.orange} format-foreground = ${colors.foreground} format-background = ${colors.background} -label = %date% %time% \ No newline at end of file +label = %date% %time% From 8364550608f34d9ad2851017b0b7b5b227fef4c3 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 19:58:09 +0200 Subject: [PATCH 3/7] Hopefully this bypasses the error handling set earlier --- arch-config/scripts/arcolinux-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index 6d9bcf79..01f3dc01 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -68,9 +68,9 @@ sudo cp -r ~/config/var / sudo cp -r ~/config/usr / #gimp plugins -mkdir ~/.config/GIMP/ -mkdir ~/.config/GIMP/2.10/ -mkdir ~/.config/GIMP/2.10/plug-ins/ +mkdir ~/.config/GIMP/ || +mkdir ~/.config/GIMP/2.10/ || +mkdir ~/.config/GIMP/2.10/plug-ins/ || rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins From e396261dbad3dd2272aeba85697528a8d95b06df Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 19:59:08 +0200 Subject: [PATCH 4/7] Added message --- arch-config/scripts/arcolinux-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index 01f3dc01..cf3532c3 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -68,9 +68,9 @@ sudo cp -r ~/config/var / sudo cp -r ~/config/usr / #gimp plugins -mkdir ~/.config/GIMP/ || -mkdir ~/.config/GIMP/2.10/ || -mkdir ~/.config/GIMP/2.10/plug-ins/ || +mkdir ~/.config/GIMP/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/plug-ins/ || echo Not creating directory rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins From d521e1d3af94742ac440a5476d0019d84361bab4 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 20:09:57 +0200 Subject: [PATCH 5/7] Lots of /dev/nulling stuff --- arch-config/scripts/arcolinux-config.sh | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index cf3532c3..b6f17aa8 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -21,23 +21,23 @@ mkdir ~/old_dat #back stuff up #config folders -rsync -ah --progress ~/.config/MangoHud ~/old_dat/.config/ && -rsync -ah --progress ~/.config/autostart ~/old_dat/.config/ && -rsync -ah --progress ~/.config/fish ~/old_dat/.config/ && -rsync -ah --progress ~/.config/gtk-3.0 ~/old_dat/.config/ && -rsync -ah --progress ~/.config/i3 ~/old_dat/.config/ && -rsync -ah --progress ~/.config/neofetch ~/old_dat/.config/ && -rsync -ah --progress ~/.config/openbox ~/old_dat/.config/ && -rsync -ah --progress ~/.config/polybar ~/old_dat/.config/ && -rsync -ah --progress ~/.config/termite ~/old_dat/.config/ && -rsync -ah --progress ~/.config/variety ~/old_dat/.config/ && +rsync -ah --progress ~/.config/MangoHud ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/autostart ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/fish ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/gtk-3.0 ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/i3 ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/neofetch ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/openbox ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/polybar ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/termite ~/old_dat/.config/ > /dev/null +rsync -ah --progress ~/.config/variety ~/old_dat/.config/ > /dev/null #other directories -rsync -ah --progress ~/scripts ~/old_dat/ && -rsync -ah --progress ~/.mozilla ~/old_dat/ && -rsync -ah --progress ~/.easystroke ~/old_dat/ && -#rsync -ah --progress ~/.emacs.d ~/old_dat/ && -rsync -ah --progress ~/.doom.d ~/old_dat/ && +rsync -ah --progress ~/scripts ~/old_dat/ > /dev/null +rsync -ah --progress ~/.mozilla ~/old_dat/ > /dev/null +rsync -ah --progress ~/.easystroke ~/old_dat/ > /dev/null +#rsync -ah --progress ~/.emacs.d ~/old_dat/ > /dev/null +rsync -ah --progress ~/.doom.d ~/old_dat/ > /dev/null echo Made backups #copy folders @@ -75,8 +75,8 @@ rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins echo Unzipping gimp plugins -unzip -o ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip -d ~/.config/GIMP/2.10/plug-ins/ -rm ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip +unzip -o ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip -d ~/.config/GIMP/2.10/plug-ins/ > /dev/null +rm ~/.config/GIMP/2.10/plug-ins/export_layers-3.3.1.zip > /dev/null echo Unzipped gimp plugins #make bash scripts executable From 4570bba756e88ea1b076a67606dff7d3ccc09da9 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 20:11:25 +0200 Subject: [PATCH 6/7] Hopefully this one works --- arch-config/scripts/arcolinux-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index b6f17aa8..52ad8ae5 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -68,9 +68,9 @@ sudo cp -r ~/config/var / sudo cp -r ~/config/usr / #gimp plugins -mkdir ~/.config/GIMP/ || echo Not creating directory -mkdir ~/.config/GIMP/2.10/ || echo Not creating directory -mkdir ~/.config/GIMP/2.10/plug-ins/ || echo Not creating directory +mkdir ~/.config/GIMP/ > /dev/null || echo Not creating directory +mkdir ~/.config/GIMP/2.10/ > /dev/null || echo Not creating directory +mkdir ~/.config/GIMP/2.10/plug-ins/ > /dev/null || echo Not creating directory rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins From 097cc3cb157fcd283c2fa8a78cd7a9e838377603 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Mon, 12 Oct 2020 20:12:33 +0200 Subject: [PATCH 7/7] Nope, doesn't work --- arch-config/scripts/arcolinux-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-config/scripts/arcolinux-config.sh b/arch-config/scripts/arcolinux-config.sh index 52ad8ae5..b6f17aa8 100644 --- a/arch-config/scripts/arcolinux-config.sh +++ b/arch-config/scripts/arcolinux-config.sh @@ -68,9 +68,9 @@ sudo cp -r ~/config/var / sudo cp -r ~/config/usr / #gimp plugins -mkdir ~/.config/GIMP/ > /dev/null || echo Not creating directory -mkdir ~/.config/GIMP/2.10/ > /dev/null || echo Not creating directory -mkdir ~/.config/GIMP/2.10/plug-ins/ > /dev/null || echo Not creating directory +mkdir ~/.config/GIMP/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/ || echo Not creating directory +mkdir ~/.config/GIMP/2.10/plug-ins/ || echo Not creating directory rsync -ah ~/config/gimp-plugins/* ~/.config/GIMP/2.10/plug-ins/ #unzip gimp plugins