home_external/.bash_aliases

@@ -31,17 +31,6 @@ alias fssizes='df -kh --output=size,used,avail,pcent,target | sort -hr'
 alias dirsizes='du -kh --apparent-size --max-depth=1 | sort -hr'
 
 
-updateSystem() {
-  executeAndNotify "doUpdateSystem $1" "system updated" "system update failed"
-}
-
-
-doUpdateSystem() {
-   updatePackages $1;
-   updateFlatpak $1;
-}
-
-
 updateFlatpak() {
    noconfirm=
    if [[ $1 == "-y" ]]; then
@@ -53,7 +42,7 @@ updateFlatpak() {
 
 doUpdateFlatpak() {
    flatpak update $1;
-   flatpak remove --unused $1;
+   flatpak remove --unused $1
 }
 
 
@@ -61,10 +50,10 @@ doUpdateFlatpak() {
 execute() {
    dir="$(pwd)";
    dir=${dir##*/};
-   if [[ -n "$2" ]]; then
-      errLog=$2;
+   if [ -n "$2" ]; then
+      errLog=$2
    else
-      errLog="execution of \"$1\" failed";
+      errLog="execution of \"$1\" failed"
    fi
 
    if ! $1; then
@@ -78,32 +67,32 @@ execute() {
 executeAndNotify () {
    dir="$(pwd)";
    dir=${dir##*/};
-   if [[ -n "$2" ]]; then
-      winLog=$2;
+   if [ -n "$2" ]; then
+      winLog=$2
    else
-      winLog="execution of \"$1\" succeeded";
+      winLog="execution of \"$1\" succeeded"
    fi
 
    if ! execute "$1" "$3"; then # arguments in quotes so they are interpreted as ONE argument each by execute()
       return 1;
    fi
-   notifyInfo "$dir: $winLog";
+   notifyInfo "$dir: $winLog"
 }
 
 
 # find file but don't print errors (e.g. can't access directory etc.)
 finds () {
-   find $* 2>/dev/null;
+   find $* 2>/dev/null
 }
 
 
 # sends a desktop-notification with an icon signalling an error
 notifyError () {
-   notify-send "$1" --icon=data-warning;
+   notify-send "$1" --icon=data-warning
 }
 
 
 # sends a desktop-notification with an icon signalling a simple information
 notifyInfo () {
-   notify-send "$1" --icon=preferences-desktop-notification;
+   notify-send "$1" --icon=preferences-desktop-notification
 }

home_external/.bash_aliases_extra

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-
-updatePackages() {
+updateSystem() {
    noconfirm=
    if [[ $1 == "-y" ]]; then
       noconfirm="--assume-yes"
@@ -10,11 +9,11 @@ updatePackages() {
    if [[ $2 == "--full" ]]; then
       full="full-"
    fi
-   executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed";
+   executeAndNotify "doUpdateSystem $noconfirm $full" "system updated" "system update failed";
 }
 
 
-doUpdatePackages() {
+doUpdateSystem() {
    sudo apt update;
    sudo apt ${2}upgrade $1;
    sudo apt autoremove $1;