Merge remote-tracking branch 'origin/master' into debian

2024-03-17 17:58:12 +01:00 · 2024-03-17 14:14:57 +01:00 · 2024-03-17 14:09:24 +01:00 · 2024-01-18 16:29:16 +01:00 · 2024-01-18 15:53:02 +01:00 · 2023-09-24 15:20:56 +02:00
6 changed files with 6 additions and 6 deletions
--- 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 [[ $# > 0 && "$1" == "--noupload" ]]; then
+if [[ "$1" == "--noupload" ]]; then
   exit 0;
 fi
--- a/scripts/dockerContainerAction.sh
+++ b/scripts/dockerContainerAction.sh
@@ -16,7 +16,7 @@ upDownContainers() {
         continue;
      fi
      cd $subdir;
-      docker compose $@;
+      docker-compose $@;
   done
 }
--- a/scripts/mount_edi.sh
+++ b/scripts/mount_edi.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 source /sync/scripts/mount_general.sh
-sshMount edi edi fabian FabisDokumente media Medien
+sshMount edi edi fabian FabisDokumente
--- a/scripts/mount_garrus.sh
+++ b/scripts/mount_garrus.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 source /sync/scripts/mount_general.sh
-sshMount fabian garrus fabian FabisDokumente media Medien
+sshMount fabian garrus fabian FabisDokumente media Filme
--- a/scripts/unmount_edi.sh
+++ b/scripts/unmount_edi.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 source /sync/scripts/unmount_general.sh
-sshUnmount FabisDokumente Medien
+sshUnmount FabisDokumente
--- a/scripts/unmount_garrus.sh
+++ b/scripts/unmount_garrus.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 source /sync/scripts/unmount_general.sh
-sshUnmount FabisDokumente Medien
+sshUnmount FabisDokumente Filme
Author	SHA1	Message	Date
fabian	4cd270ac54	Merge remote-tracking branch 'origin/master' into debian	2024-03-17 17:58:12 +01:00
fabian	e37268fd88	Merge remote-tracking branch 'origin/master' into debian	2024-03-17 14:14:57 +01:00
fabian	f23a40f524	Merge remote-tracking branch 'origin/master' into debian	2024-03-17 14:09:24 +01:00
fabian	96893dff23	Merge remote-tracking branch 'origin/master' into debian	2024-01-18 16:29:16 +01:00
fabian	31e618be9e	Merge remote-tracking branch 'origin/master' into debian	2024-01-18 15:53:02 +01:00
fabian	236672fd44	Merge remote-tracking branch 'origin/master' into debian	2023-09-24 15:20:56 +02:00
fabian	6f16c5e710	Merge remote-tracking branch 'origin/master' into debian	2023-09-17 14:43:55 +02:00
fabian	8e29301d96	Merge remote-tracking branch 'origin/master' into debian	2023-09-17 14:33:42 +02:00
fabian	6fb25215b5	Merge remote-tracking branch 'origin/master' into debian	2023-08-20 17:32:10 +02:00
fabian	812805ced5	Merge remote-tracking branch 'origin/master' into debian	2023-08-20 14:49:40 +02:00
fabian	632a0c6741	Merge remote-tracking branch 'origin/master' into debian	2023-07-30 09:56:57 +02:00
fabian	25065ea703	Merge remote-tracking branch 'origin/master' into debian	2023-07-06 15:39:29 +02:00
fabian	fd9dba9f12	Merge remote-tracking branch 'origin/master' into debian	2023-07-06 13:00:17 +02:00
fabian	3d740f1c3b	Merge branch 'master' into debian	2023-06-02 16:03:05 +02:00
fabian	647831e860	improved automatic updates via executeAndNotify to enable fire-and-forget	2023-06-02 15:57:57 +02:00
fabian	452fd7600d	new function to update debian based systems	2023-05-31 10:55:35 +02:00
fabian	d84d9e6933	Merge branch 'debian' of ssh://git.szimnau.de:222/fabian/sync into debian	2023-05-31 10:42:56 +02:00
fabian	12e5c3e2b1	- commented out options not working in ancient debian version	2023-05-31 10:42:41 +02:00
fabian	49335145fd	Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit `844fe85d6d`.	2023-05-31 10:42:41 +02:00
fabian	ec5a09da64	Merge remote-tracking branch 'origin/master' into debian	2023-05-27 18:14:45 +02:00
fabian	bb277234ea	Merge branch 'master' into debian	2023-05-19 18:34:17 +02:00
fabian	2d4027379b	Merge branch 'master' into debian	2023-05-19 15:14:21 +02:00
fabian	d59183ad63	Merge branch 'master' into debian	2023-05-14 12:50:49 +02:00
fabian	2233d47782	Merge remote-tracking branch 'origin/master' into debian	2023-05-14 12:20:09 +02:00
fabian	1d3d82aa5b	Merge branch 'debian' of git.szimnau.de:fabian/sync into debian	2023-05-14 12:19:05 +02:00
fabian	d6cc45381e	- commented out options not working in ancient debian version	2023-05-14 12:18:13 +02:00
fabian	de22a1668e	Merge remote-tracking branch 'origin/master' into debian	2023-05-06 15:19:37 +02:00
fabian	6c283839fb	Merge remote-tracking branch 'origin/master' into debian	2023-05-06 06:10:23 +02:00
fabian	682dc5f18a	Merge remote-tracking branch 'origin/master' into debian	2023-05-06 05:45:19 +02:00
fabian	ea7c081bd4	Merge remote-tracking branch 'origin/master' into debian	2023-05-06 04:57:15 +02:00
fabian	5881642a40	Revert "Revert "old raspi version of nanorc cannot handle certain settings"" This reverts commit `844fe85d6d`.	2023-05-06 04:11:17 +02:00
`@@ -3,4 +3,4 @@ set -euo pipefail`

	`source /sync/scripts/mount_general.sh`	`source /sync/scripts/mount_general.sh`

	`sshMount edi edi fabian FabisDokumente media Medien`	`sshMount edi edi fabian FabisDokumente`
`@@ -3,4 +3,4 @@ set -euo pipefail`

	`source /sync/scripts/unmount_general.sh`	`source /sync/scripts/unmount_general.sh`

	`sshUnmount FabisDokumente Medien`	`sshUnmount FabisDokumente`