diff --git a/home_external/.bash_aliases b/home_external/.bash_aliases index 34f2456..049b310 100644 --- a/home_external/.bash_aliases +++ b/home_external/.bash_aliases @@ -40,6 +40,11 @@ alias dirsizes='du -kh --apparent-size --max-depth=1 | sort -hr' alias start_x11_vnc="x11vnc -many -display :0 -no6 -rfbport 5900 -auth /var/run/lightdm/root/:0 -rfbauth $HOME/.vnc/passwd" +commandExists() { + type $1 2 >& 1 > /dev/null +} + + rsyncLink() { source=$1; linkSource="$(realpath $source)"; @@ -52,7 +57,7 @@ rsyncLink() { updateSystem() { - executeAndNotify "doUpdateSystem $1" "system updated" "system update failed" + executeAndNotify "doUpdateSystem $1" "system updated" "system update failed" } @@ -63,6 +68,9 @@ doUpdateSystem() { updateFlatpak() { + if [[ ! $(commandExists flatpak) ]]; then + return 1; + fi noconfirm= if [[ $1 == "-y" ]]; then noconfirm="--assumeyes"; @@ -119,11 +127,19 @@ finds () { # sends a desktop-notification with an icon signalling an error notifyError () { - notify-send "$1" --icon=data-warning; + if [[ ! $(commandExists notify-send) ]]; then + echo "ERROR: $1"; + else + notify-send "$1" --icon=data-warning; + fi } # sends a desktop-notification with an icon signalling a simple information notifyInfo () { - notify-send "$1" --icon=preferences-desktop-notification; + if [[ ! $(commandExists notify-send) ]]; then + echo "INFO: $1"; + else + notify-send "$1" --icon=preferences-desktop-notification; + fi } diff --git a/home_external/.bashrc b/home_external/.bashrc index 2ff28c1..a6b623c 100644 --- a/home_external/.bashrc +++ b/home_external/.bashrc @@ -2,7 +2,7 @@ # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples -set -o pipefail +# set -o pipefail # set -u # If not running interactively, don't do anything diff --git a/home_external/.config/wezterm/.wezterm.lua b/home_external/.config/wezterm/.wezterm.lua deleted file mode 100644 index ba56929..0000000 --- a/home_external/.config/wezterm/.wezterm.lua +++ /dev/null @@ -1,116 +0,0 @@ --- Pull in the wezterm API -local wezterm = require 'wezterm' -local act = wezterm.action -local mux = wezterm.mux - --- This will hold the configuration. -local config = wezterm.config_builder() - --- This is where you actually apply your config choices - --- For example, changing the color scheme: -config.color_scheme = 'AdventureTime' --- config.font = wezterm.font 'JetBrains Mono' -- also the default -config.font = wezterm.font 'Fira Code' -config.font_size = 12.0 -- also the default - --- Spawn a git bash shell -config.default_prog = { 'C:/Program Files/Git/bin/bash.exe' , '--cd-to-home' } - --- cursor shape and behaviour -config.default_cursor_style = 'BlinkingBar' -config.animation_fps = 1 -config.cursor_blink_ease_in = 'Constant' -config.cursor_blink_ease_out = 'Constant' - -config.enable_kitty_keyboard = true - --- window appearance -config.enable_scroll_bar = true -config.window_padding = { - left = 0, - right = 0, - top = 0, - bottom = 0, -} --- config.initial_rows = 50; - ---[[wezterm.on('gui-startup', function(cmd) - local tab, pane, window = mux.spawn_window(cmd or {}) - -- Create a split occupying the right 1/3 of the screen - local loading_bar_pane = pane:split { - direction = 'Bottom', - size = 0.06, - } - -- go to JavaUtils-Directory and prepare command - loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\njava de.szimnau.WorkLoadingBar' - -- optionally: clear before preparing command - -- loading_bar_pane:send_text 'cd JavaUtils/zeitlaeufer/target\nc\njava de.szimnau.WorkLoadingBar' -end)]] - -config.keys = { - -- This will create a new horizontal split and run your default program inside it - { - key = 'E', - mods = 'CTRL|SHIFT', - action = act.SplitHorizontal { domain = 'CurrentPaneDomain' }, - }, - -- This will create a new vertical split and run your default program inside it - { - key = 'O', - mods = 'CTRL|SHIFT', - action = act.SplitVertical { domain = 'CurrentPaneDomain' }, - }, - -- resize the current split - { - key = 'UpArrow', - mods = 'CTRL|SHIFT', - action = act.AdjustPaneSize { 'Up', 1 }, - }, - { - key = 'DownArrow', - mods = 'CTRL|SHIFT', - action = act.AdjustPaneSize { 'Down', 1 }, - }, - { - key = 'LeftArrow', - mods = 'CTRL|SHIFT', - action = act.AdjustPaneSize { 'Left', 1 } - }, - { - key = 'RightArrow', - mods = 'CTRL|SHIFT', - action = act.AdjustPaneSize { 'Right', 1 }, - }, - -- move around the splits - { - key = 'UpArrow', - mods = 'ALT', - action = act.ActivatePaneDirection 'Up', - }, - { - key = 'DownArrow', - mods = 'ALT', - action = act.ActivatePaneDirection 'Down', - }, - { - key = 'LeftArrow', - mods = 'ALT', - action = act.ActivatePaneDirection 'Left', - }, - { - key = 'RightArrow', - mods = 'ALT', - action = act.ActivatePaneDirection 'Right', - }, - -- makes pane take up all available space in the tab, hiding all other panes - { - key = 'X', - mods = 'CTRL|SHIFT', - action = wezterm.action.TogglePaneZoomState, - }, -} - - --- and finally, return the configuration to wezterm -return config diff --git a/scripts/backup_edi.sh b/scripts/backup_edi.sh index 42d8ee2..15242e6 100755 --- a/scripts/backup_edi.sh +++ b/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!" diff --git a/scripts/backup_shepard.sh b/scripts/backup_shepard.sh index f14eb87..e999ea4 100755 --- a/scripts/backup_shepard.sh +++ b/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 diff --git a/scripts/downContainers.sh b/scripts/downContainers.sh index d316520..19cd1bc 100755 --- a/scripts/downContainers.sh +++ b/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 $@ diff --git a/scripts/escapeFilenames.sh b/scripts/escapeFilenames.sh index e41eb3e..d6e8e91 100755 --- a/scripts/escapeFilenames.sh +++ b/scripts/escapeFilenames.sh @@ -13,6 +13,7 @@ replacements['(']='_'; replacements[')']='_'; replacements['[']='_'; replacements[']']='_'; +replacements[',']='_'; while [[ $# > 0 ]]; do replacements["$1"]="$2"; shift 2; diff --git a/scripts/postTreatmentAudible.sh b/scripts/postTreatmentAudible.sh new file mode 100755 index 0000000..db2c95b --- /dev/null +++ b/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 diff --git a/scripts/pullContainers.sh b/scripts/pullContainers.sh index 1c43f63..f242957 100755 --- a/scripts/pullContainers.sh +++ b/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 $@ diff --git a/scripts/reencode_m4a.sh b/scripts/reencode_m4a.sh index 8ddc742..cbe5726 100755 --- a/scripts/reencode_m4a.sh +++ b/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 diff --git a/scripts/upContainers.sh b/scripts/upContainers.sh index 69a59db..f7b73ae 100755 --- a/scripts/upContainers.sh +++ b/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 $@