From 5881642a4052913f12ab4b411182842d57749c9c Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 04:11:17 +0200 Subject: [PATCH 01/22] Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit 844fe85d6d6b5a96b21e6bcf8f44de3cf936379f. --- home_external/.config/nano/nanorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home_external/.config/nano/nanorc b/home_external/.config/nano/nanorc index 7c13914..21e7054 100644 --- a/home_external/.config/nano/nanorc +++ b/home_external/.config/nano/nanorc @@ -89,7 +89,7 @@ set linenumbers set matchbrackets "(<[{)>]}" ## Suppress title bar and show file name and editor state at the bottom. -set minibar +# set minibar ## Enable mouse support, if available for your system. When enabled, ## mouse clicks can be used to place the cursor, set the mark (with a -- 2.49.1 From d6cc45381eb07ea3a75344eb3c55baf17c1ded82 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 14 May 2023 12:18:13 +0200 Subject: [PATCH 02/22] - commented out options not working in ancient debian version --- home_external/.config/rofi/config.rasi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home_external/.config/rofi/config.rasi b/home_external/.config/rofi/config.rasi index 2d0b8eb..ae0955a 100644 --- a/home_external/.config/rofi/config.rasi +++ b/home_external/.config/rofi/config.rasi @@ -139,13 +139,13 @@ configuration { /* me-select-entry: "MousePrimary";*/ /* me-accept-entry: "MouseDPrimary";*/ /* me-accept-custom: "Control+MouseDPrimary";*/ - timeout { +/* timeout { action: "kb-cancel"; delay: 0; } filebrowser { directories-first: true; sorting-method: "name"; - } + }*/ } @theme "/usr/share/rofi/themes/Arc-Dark.rasi" -- 2.49.1 From 49335145fd904f2ebb33e7e2d1968d01fbd1261a Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 04:11:17 +0200 Subject: [PATCH 03/22] Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit 844fe85d6d6b5a96b21e6bcf8f44de3cf936379f. --- home_external/.config/nano/nanorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home_external/.config/nano/nanorc b/home_external/.config/nano/nanorc index 7c13914..21e7054 100644 --- a/home_external/.config/nano/nanorc +++ b/home_external/.config/nano/nanorc @@ -89,7 +89,7 @@ set linenumbers set matchbrackets "(<[{)>]}" ## Suppress title bar and show file name and editor state at the bottom. -set minibar +# set minibar ## Enable mouse support, if available for your system. When enabled, ## mouse clicks can be used to place the cursor, set the mark (with a -- 2.49.1 From 12e5c3e2b156fac45d45ef213bd8264f14810aa0 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 14 May 2023 12:18:13 +0200 Subject: [PATCH 04/22] - commented out options not working in ancient debian version --- home_external/.config/rofi/config.rasi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home_external/.config/rofi/config.rasi b/home_external/.config/rofi/config.rasi index 2d0b8eb..ae0955a 100644 --- a/home_external/.config/rofi/config.rasi +++ b/home_external/.config/rofi/config.rasi @@ -139,13 +139,13 @@ configuration { /* me-select-entry: "MousePrimary";*/ /* me-accept-entry: "MouseDPrimary";*/ /* me-accept-custom: "Control+MouseDPrimary";*/ - timeout { +/* timeout { action: "kb-cancel"; delay: 0; } filebrowser { directories-first: true; sorting-method: "name"; - } + }*/ } @theme "/usr/share/rofi/themes/Arc-Dark.rasi" -- 2.49.1 From 452fd7600db17d1d6d8a27387d371ce7cf8750f9 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 31 May 2023 10:55:35 +0200 Subject: [PATCH 05/22] new function to update debian based systems --- home_external/.bash_aliases_extra | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra index e69de29..799fcb5 100644 --- a/home_external/.bash_aliases_extra +++ b/home_external/.bash_aliases_extra @@ -0,0 +1,9 @@ +updateSystem() { + noconfirm= + if [[ $1 == "-y" ]]; then + noconfirm="-y" + fi + sudo apt update; + sudo apt upgrade $noconfirm; + sudo apt autoremove $noconfirm; +} -- 2.49.1 From 647831e8601b9a40a60b0151bb55bb9ff0dfffca Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 2 Jun 2023 15:57:57 +0200 Subject: [PATCH 06/22] improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_extra | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra index 799fcb5..ad0a437 100644 --- a/home_external/.bash_aliases_extra +++ b/home_external/.bash_aliases_extra @@ -1,9 +1,20 @@ +#!/usr/bin/env bash + updateSystem() { noconfirm= if [[ $1 == "-y" ]]; then - noconfirm="-y" + noconfirm="--assume-yes" fi - sudo apt update; - sudo apt upgrade $noconfirm; - sudo apt autoremove $noconfirm; + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed"; +} + + +doUpdateSystem() { + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; } -- 2.49.1 From a50baf801c2b33e683af7b2c71ae7960313b9157 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 04:11:17 +0200 Subject: [PATCH 07/22] Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit 844fe85d6d6b5a96b21e6bcf8f44de3cf936379f. --- home_external/.config/nano/nanorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home_external/.config/nano/nanorc b/home_external/.config/nano/nanorc index 7c13914..21e7054 100644 --- a/home_external/.config/nano/nanorc +++ b/home_external/.config/nano/nanorc @@ -89,7 +89,7 @@ set linenumbers set matchbrackets "(<[{)>]}" ## Suppress title bar and show file name and editor state at the bottom. -set minibar +# set minibar ## Enable mouse support, if available for your system. When enabled, ## mouse clicks can be used to place the cursor, set the mark (with a -- 2.49.1 From 1952ece138c9fe80ad0e8c4f98d045791a087848 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 14 May 2023 12:18:13 +0200 Subject: [PATCH 08/22] - commented out options not working in ancient debian version --- home_external/.config/rofi/config.rasi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home_external/.config/rofi/config.rasi b/home_external/.config/rofi/config.rasi index 2d0b8eb..ae0955a 100644 --- a/home_external/.config/rofi/config.rasi +++ b/home_external/.config/rofi/config.rasi @@ -139,13 +139,13 @@ configuration { /* me-select-entry: "MousePrimary";*/ /* me-accept-entry: "MouseDPrimary";*/ /* me-accept-custom: "Control+MouseDPrimary";*/ - timeout { +/* timeout { action: "kb-cancel"; delay: 0; } filebrowser { directories-first: true; sorting-method: "name"; - } + }*/ } @theme "/usr/share/rofi/themes/Arc-Dark.rasi" -- 2.49.1 From e99b430ce8fa40a0d4f52982065232e4a9f56f6a Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 31 Mar 2024 23:54:05 +0200 Subject: [PATCH 09/22] new function to update debian based systems improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_branched | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/home_external/.bash_aliases_branched b/home_external/.bash_aliases_branched index c2539e2..47bfa4b 100644 --- a/home_external/.bash_aliases_branched +++ b/home_external/.bash_aliases_branched @@ -4,13 +4,18 @@ updatePackages() { noconfirm= if [[ $1 == "-y" ]]; then - noconfirm="--no-confirm"; + noconfirm="--assume-yes" fi - executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed"; + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed"; } doUpdatePackages() { - pamac update $1; - pamac remove --orphans --cascade $1; + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; } -- 2.49.1 From 08fbd0beb94f82b7927515777716134bcef6e75e Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 31 Mar 2024 23:54:05 +0200 Subject: [PATCH 10/22] new function to update debian based systems improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_branched | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/home_external/.bash_aliases_branched b/home_external/.bash_aliases_branched index c2539e2..47bfa4b 100644 --- a/home_external/.bash_aliases_branched +++ b/home_external/.bash_aliases_branched @@ -4,13 +4,18 @@ updatePackages() { noconfirm= if [[ $1 == "-y" ]]; then - noconfirm="--no-confirm"; + noconfirm="--assume-yes" fi - executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed"; + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed"; } doUpdatePackages() { - pamac update $1; - pamac remove --orphans --cascade $1; + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; } -- 2.49.1 From bb09061c3b02dcfec2a22c5cbed0653613df9e8c Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 2 Jun 2023 15:57:57 +0200 Subject: [PATCH 11/22] improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_extra | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 home_external/.bash_aliases_extra diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra new file mode 100644 index 0000000..ad0a437 --- /dev/null +++ b/home_external/.bash_aliases_extra @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +updateSystem() { + noconfirm= + if [[ $1 == "-y" ]]; then + noconfirm="--assume-yes" + fi + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed"; +} + + +doUpdateSystem() { + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; +} -- 2.49.1 From 0d7c1902c18e2ff2367effe15792c7fa1d81a12b Mon Sep 17 00:00:00 2001 From: fabian Date: Mon, 1 Apr 2024 00:17:07 +0200 Subject: [PATCH 12/22] fkin just work now... please --- home_external/.bash_aliases_extra | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 home_external/.bash_aliases_extra diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra deleted file mode 100644 index ad0a437..0000000 --- a/home_external/.bash_aliases_extra +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -updateSystem() { - noconfirm= - if [[ $1 == "-y" ]]; then - noconfirm="--assume-yes" - fi - full= - if [[ $2 == "--full" ]]; then - full="full-" - fi - executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed"; -} - - -doUpdateSystem() { - sudo apt update; - sudo apt ${2}upgrade $1; - sudo apt autoremove $1; -} -- 2.49.1 From ae2779f48e20a6e27ce824cce38a6b8625605712 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 1 Sep 2024 14:46:44 +0200 Subject: [PATCH 13/22] fix npe-like-error --- scripts/backup_edi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup_edi.sh b/scripts/backup_edi.sh index adee0e9..42d8ee2 100755 --- a/scripts/backup_edi.sh +++ b/scripts/backup_edi.sh @@ -32,7 +32,7 @@ backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/ ### upload backup ### ##################### -if [[ "$1" == "--noupload" ]]; then +if [[ $# > 0 && "$1" == "--noupload" ]]; then exit 0; fi -- 2.49.1 From d3d0a4cc5d897773f08508cdb9d3c10d5b617df6 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 1 Sep 2024 14:47:17 +0200 Subject: [PATCH 14/22] updated command to docker compose 2.0 --- scripts/dockerContainerAction.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerContainerAction.sh b/scripts/dockerContainerAction.sh index 74a4e1f..87e2da9 100644 --- a/scripts/dockerContainerAction.sh +++ b/scripts/dockerContainerAction.sh @@ -16,7 +16,7 @@ upDownContainers() { continue; fi cd $subdir; - docker-compose $@; + docker compose $@; done } -- 2.49.1 From cc3760347c3366ef0e6782608e022b44c5514e6d Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 1 Sep 2024 14:49:14 +0200 Subject: [PATCH 15/22] fixed prints --- scripts/backup_garrus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/backup_garrus.sh b/scripts/backup_garrus.sh index aac6f07..c8e24bb 100755 --- a/scripts/backup_garrus.sh +++ b/scripts/backup_garrus.sh @@ -29,9 +29,9 @@ fi ### upload backup ### ##################### -echo $'upload of backup still manual for now.\nplease execute the following commands:' +echo 'upload of backup still manual for now.\nplease execute the following commands:' echo 'su garrus' -echo 'sd rsync_backup $BACKUP_DIR/ /citadel/backup/garrus/' +echo "sd rsync_backup $BACKUP_DIR/ /citadel/backup/garrus/" exit 0 su garrus -- 2.49.1 From 2af9cc20dfa57028215c5e628a803c19bd6d8e50 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 04:11:17 +0200 Subject: [PATCH 16/22] Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit 844fe85d6d6b5a96b21e6bcf8f44de3cf936379f. --- home_external/.config/nano/nanorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home_external/.config/nano/nanorc b/home_external/.config/nano/nanorc index 7c13914..21e7054 100644 --- a/home_external/.config/nano/nanorc +++ b/home_external/.config/nano/nanorc @@ -89,7 +89,7 @@ set linenumbers set matchbrackets "(<[{)>]}" ## Suppress title bar and show file name and editor state at the bottom. -set minibar +# set minibar ## Enable mouse support, if available for your system. When enabled, ## mouse clicks can be used to place the cursor, set the mark (with a -- 2.49.1 From 96821cf0aa2b1c717a92b9c9cda1f95237f63dce Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 14 May 2023 12:18:13 +0200 Subject: [PATCH 17/22] - commented out options not working in ancient debian version --- home_external/.config/rofi/config.rasi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home_external/.config/rofi/config.rasi b/home_external/.config/rofi/config.rasi index 2d0b8eb..ae0955a 100644 --- a/home_external/.config/rofi/config.rasi +++ b/home_external/.config/rofi/config.rasi @@ -139,13 +139,13 @@ configuration { /* me-select-entry: "MousePrimary";*/ /* me-accept-entry: "MouseDPrimary";*/ /* me-accept-custom: "Control+MouseDPrimary";*/ - timeout { +/* timeout { action: "kb-cancel"; delay: 0; } filebrowser { directories-first: true; sorting-method: "name"; - } + }*/ } @theme "/usr/share/rofi/themes/Arc-Dark.rasi" -- 2.49.1 From cb88a86e7164b3ee2ec9927bafee374d897a8f08 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 31 Mar 2024 23:54:05 +0200 Subject: [PATCH 18/22] new function to update debian based systems improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_branched | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/home_external/.bash_aliases_branched b/home_external/.bash_aliases_branched index c2539e2..47bfa4b 100644 --- a/home_external/.bash_aliases_branched +++ b/home_external/.bash_aliases_branched @@ -4,13 +4,18 @@ updatePackages() { noconfirm= if [[ $1 == "-y" ]]; then - noconfirm="--no-confirm"; + noconfirm="--assume-yes" fi - executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed"; + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed"; } doUpdatePackages() { - pamac update $1; - pamac remove --orphans --cascade $1; + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; } -- 2.49.1 From 0d9f4cfb258e216218fb3b02c3a79c3fd6227153 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 2 Jun 2023 15:57:57 +0200 Subject: [PATCH 19/22] improved automatic updates via executeAndNotify to enable fire-and-forget --- home_external/.bash_aliases_extra | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 home_external/.bash_aliases_extra diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra new file mode 100644 index 0000000..ad0a437 --- /dev/null +++ b/home_external/.bash_aliases_extra @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +updateSystem() { + noconfirm= + if [[ $1 == "-y" ]]; then + noconfirm="--assume-yes" + fi + full= + if [[ $2 == "--full" ]]; then + full="full-" + fi + executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed"; +} + + +doUpdateSystem() { + sudo apt update; + sudo apt ${2}upgrade $1; + sudo apt autoremove $1; +} -- 2.49.1 From bb7fa9ae79dda38190fa9b0668d08cadbf38d994 Mon Sep 17 00:00:00 2001 From: fabian Date: Mon, 1 Apr 2024 00:17:07 +0200 Subject: [PATCH 20/22] fkin just work now... please --- home_external/.bash_aliases_extra | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 home_external/.bash_aliases_extra diff --git a/home_external/.bash_aliases_extra b/home_external/.bash_aliases_extra deleted file mode 100644 index ad0a437..0000000 --- a/home_external/.bash_aliases_extra +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -updateSystem() { - noconfirm= - if [[ $1 == "-y" ]]; then - noconfirm="--assume-yes" - fi - full= - if [[ $2 == "--full" ]]; then - full="full-" - fi - executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed"; -} - - -doUpdateSystem() { - sudo apt update; - sudo apt ${2}upgrade $1; - sudo apt autoremove $1; -} -- 2.49.1 From 685957301daece4a96048dd7d5c621d332e5d8d4 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 1 Sep 2024 14:46:44 +0200 Subject: [PATCH 21/22] fix npe-like-error --- scripts/backup_edi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup_edi.sh b/scripts/backup_edi.sh index adee0e9..42d8ee2 100755 --- a/scripts/backup_edi.sh +++ b/scripts/backup_edi.sh @@ -32,7 +32,7 @@ backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/ ### upload backup ### ##################### -if [[ "$1" == "--noupload" ]]; then +if [[ $# > 0 && "$1" == "--noupload" ]]; then exit 0; fi -- 2.49.1 From 57e52b78a25cc803d0eebd52aa0a56394063c0a6 Mon Sep 17 00:00:00 2001 From: fabian Date: Sun, 1 Sep 2024 14:47:17 +0200 Subject: [PATCH 22/22] updated command to docker compose 2.0 --- scripts/dockerContainerAction.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerContainerAction.sh b/scripts/dockerContainerAction.sh index 74a4e1f..87e2da9 100644 --- a/scripts/dockerContainerAction.sh +++ b/scripts/dockerContainerAction.sh @@ -16,7 +16,7 @@ upDownContainers() { continue; fi cd $subdir; - docker-compose $@; + docker compose $@; done } -- 2.49.1