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

.sublime/sync.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": ".."
+		}
+	]
+}

home_external/.bash_aliases

@@ -14,7 +14,7 @@ alias rsync_default="rsync $DEFAULT_RSYNC --checksum"
 # source /usr/share/bash-completion/completions/rsync
 # complete -F _rsync rsync_default
 alias rsync_backup="rsync $DEFAULT_RSYNC --checksum --times --group --owner --delete"
-alias rsync_move='rsync $DEFAULT_RSYNC --checksum --remove-source-files'
+alias rsync_move="rsync $DEFAULT_RSYNC --checksum --remove-source-files"
 alias rsync_update="rsync $DEFAULT_RSYNC --update --times"
 alias rsync_copy="rsync $DEFAULT_RSYNC --ignore-times"
 alias off='systemctl poweroff'

scripts/escapeFilenames.sh

@@ -8,6 +8,9 @@ declare -A replacements
 unset replacements[0]
 replacements[' ']='_';
 replacements[':']='_';
+replacements["'"]='_';
+replacements['(']='_';
+replacements[')']='_';
 while [[ $# > 0 ]]; do
    replacements["$1"]="$2";
    shift 2;

scripts/reencode_audio.sh

@@ -2,7 +2,8 @@
 set -euo pipefail
 
 # ensure existence of destination folder
-dest=../reencode
+dir="$(pwd)"
+dest=${dir%/*}/${dir##*/}_reencode
 if [[ !(-d $dest) ]]; then
    mkdir $dest
 fi

scripts/reencode_m4a.sh

@@ -18,7 +18,8 @@ if [[ -z $vbr ]]; then
 fi
 
 # ensure existence of destination folder
-dest=../reencode
+dir="$(pwd)"
+dest=${dir%/*}/${dir##*/}_reencode
 if [[ !(-d $dest) ]]; then
    mkdir $dest
 fi

scripts/transcode_opus.sh

@@ -13,12 +13,14 @@ while [[ $# > 0 ]]; do
 done
 
 # ensure existence of destination folder
-dest=../transcode_m4a
+dir="$(pwd)"
+dest=${dir%/*}/${dir##*/}_ogg
 if [[ !(-d $dest) ]]; then
    mkdir $dest
 fi
 
 for file in ./*.$file_suffix; do
-   echo "ffmpeg -i '$file' -c:a libfdk_aac -profile:a aac_he -b:a 64k $map -movflags +faststart '$dest/${file%$file_suffix}m4a'";
-   ffmpeg -i "$file" -c:a libfdk_aac -profile:a aac_he -b:a 64k $map -movflags +faststart "$dest/${file%$file_suffix}m4a";
+   # `-vbr on -application audio` should be default, but let's be sure
+   echo "ffmpeg -i '$file' -c:a libopus -b:a 64k -vbr on -application audio $map '$dest/${file%$file_suffix}ogg'";
+   ffmpeg -i "$file" -c:a libopus -b:a 64k -vbr on -application audio $map "$dest/${file%$file_suffix}ogg";
 done