Merge branch 'master' into debian

scripts/backup_edi.sh

@@ -36,6 +36,6 @@ if [[ $# > 0 && "$1" == "--noupload" ]]; then
    exit 0;
 fi
 
-sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" --filter="P /home/docker" /sync/backup/ fabian@garrus:/citadel/backup/edi/
+sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /sync/backup/ fabian@garrus:/citadel/backup/edi/
 sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /home/edi/docker/ fabian@garrus:/citadel/backup/edi/home/docker/
 echo "Note: remember to keep /citadel in sync!"

scripts/backup_shepard.sh

@@ -20,7 +20,7 @@ backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
 ### upload backup ###
 #####################
 
-if [[ "$1" == "--noupload" ]]; then
+if [[ $# > 0 && "$1" == "--noupload" ]]; then
    exit 0;
 fi
 

scripts/downContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers down
+upDownContainers down $@

scripts/escapeFilenames.sh

@@ -13,6 +13,7 @@ replacements['(']='_';
 replacements[')']='_';
 replacements['[']='_';
 replacements[']']='_';
+replacements[',']='_';
 while [[ $# > 0 ]]; do
    replacements["$1"]="$2";
    shift 2;

scripts/postTreatmentAudible.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+/sync/scripts/escapeFilenames.sh . _
+for d in *; do
+   cd "$d";
+   /sync/scripts/escapeFilenames.sh Chapter Kapitel
+   /sync/scripts/reencode_m4a.sh -map;
+   rm *.m4a;
+   mv * "../${d}_reencode";
+   cd ..;
+   rmdir "$d"
+   mv "${d}_reencode" "$d";
+done

scripts/pullContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers pull
+upDownContainers pull $@

scripts/reencode_m4a.sh

@@ -6,15 +6,15 @@ map=
 vbr=
 while [[ $# > 0 ]]; do
    case $1 in
-      -map) map='-map 0:0';                          shift;;
-      -vbr) vbr='aac_at -profile:a aac_he -b:a 64k'; shift;;
+      -map) map='-map 0:a';                          shift;;
+      -vbr) vbr='aac -profile:a aac_he -b:a 64k';    shift;;
       *   )                                          break ;; # Anything else stops command line processing.
    esac
 done
 
 # if no variable bitrate, just copy audio
 if [[ -z $vbr ]]; then
-   map="$map copy"
+   vbr="copy"
 fi
 
 # ensure existence of destination folder

scripts/upContainers.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 source /sync/scripts/dockerContainerAction.sh
 
 # FIXME!!! implement possibility to pass down directory
-upDownContainers up -d
+upDownContainers up -d $@