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

This commit is contained in:
fabian 2023-07-30 09:56:57 +02:00
commit 632a0c6741
4 changed files with 16 additions and 2488 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
/backup
output.txt
.bash_aliases_local
/.sublime

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -19,6 +19,7 @@ alias rsync_backup="rsync $DEFAULT_RSYNC --checksum --times --group --owner --de
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 copy_link='cp --no-dereference --recursive --preserve=all --link' # not --force to make it optional
alias off='systemctl poweroff'
alias nnn='nnn -dHrR'
alias nn='n -dHrR'
@ -29,6 +30,19 @@ alias mountdrive='udisksctl mount -b'
alias unmountdrive='udisksctl unmount -b'
alias fssizes='df -kh --output=size,used,avail,pcent,target | sort -hr'
alias dirsizes='du -kh --apparent-size --max-depth=1 | sort -hr'
# sed -ie 's/Beispiel/Ersetzung/' *.xml
# sed -Eie 's/(Beispiel)/\1Anhang/' *.xml
rsyncLink() {
source=$1;
linkSource="$(realpath $source)";
linkSource=${linkSource%/}; # cut off trailing "/"
shift;
dest=$1;
shift;
rsync $DEFAULT_RSYNC --one-file-system --link-dest=$linkSource $source $dest $*;
}
updateSystem() {
@ -77,7 +91,7 @@ execute() {
# executes command and notifies upon success or failure
executeAndNotify () {
dir="$(pwd)";
dir=${dir##*/};
dir=${dir##*/}; # cut off previous path (/path/to/foo.txt -> foo.txt)
if [[ -n "$2" ]]; then
winLog=$2;
else