Compare commits
No commits in common. "fd9dba9f12c0425e7c974d547d7403481b5db7be" and "3d740f1c3b984af1d692688cae8b653bc8e54233" have entirely different histories.
fd9dba9f12
...
3d740f1c3b
@ -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'
|
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() {
|
updateFlatpak() {
|
||||||
noconfirm=
|
noconfirm=
|
||||||
if [[ $1 == "-y" ]]; then
|
if [[ $1 == "-y" ]]; then
|
||||||
@ -53,7 +42,7 @@ updateFlatpak() {
|
|||||||
|
|
||||||
doUpdateFlatpak() {
|
doUpdateFlatpak() {
|
||||||
flatpak update $1;
|
flatpak update $1;
|
||||||
flatpak remove --unused $1;
|
flatpak remove --unused $1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -61,10 +50,10 @@ doUpdateFlatpak() {
|
|||||||
execute() {
|
execute() {
|
||||||
dir="$(pwd)";
|
dir="$(pwd)";
|
||||||
dir=${dir##*/};
|
dir=${dir##*/};
|
||||||
if [[ -n "$2" ]]; then
|
if [ -n "$2" ]; then
|
||||||
errLog=$2;
|
errLog=$2
|
||||||
else
|
else
|
||||||
errLog="execution of \"$1\" failed";
|
errLog="execution of \"$1\" failed"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! $1; then
|
if ! $1; then
|
||||||
@ -78,32 +67,32 @@ execute() {
|
|||||||
executeAndNotify () {
|
executeAndNotify () {
|
||||||
dir="$(pwd)";
|
dir="$(pwd)";
|
||||||
dir=${dir##*/};
|
dir=${dir##*/};
|
||||||
if [[ -n "$2" ]]; then
|
if [ -n "$2" ]; then
|
||||||
winLog=$2;
|
winLog=$2
|
||||||
else
|
else
|
||||||
winLog="execution of \"$1\" succeeded";
|
winLog="execution of \"$1\" succeeded"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! execute "$1" "$3"; then # arguments in quotes so they are interpreted as ONE argument each by execute()
|
if ! execute "$1" "$3"; then # arguments in quotes so they are interpreted as ONE argument each by execute()
|
||||||
return 1;
|
return 1;
|
||||||
fi
|
fi
|
||||||
notifyInfo "$dir: $winLog";
|
notifyInfo "$dir: $winLog"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# find file but don't print errors (e.g. can't access directory etc.)
|
# find file but don't print errors (e.g. can't access directory etc.)
|
||||||
finds () {
|
finds () {
|
||||||
find $* 2>/dev/null;
|
find $* 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# sends a desktop-notification with an icon signalling an error
|
# sends a desktop-notification with an icon signalling an error
|
||||||
notifyError () {
|
notifyError () {
|
||||||
notify-send "$1" --icon=data-warning;
|
notify-send "$1" --icon=data-warning
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# sends a desktop-notification with an icon signalling a simple information
|
# sends a desktop-notification with an icon signalling a simple information
|
||||||
notifyInfo () {
|
notifyInfo () {
|
||||||
notify-send "$1" --icon=preferences-desktop-notification;
|
notify-send "$1" --icon=preferences-desktop-notification
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
updateSystem() {
|
||||||
updatePackages() {
|
|
||||||
noconfirm=
|
noconfirm=
|
||||||
if [[ $1 == "-y" ]]; then
|
if [[ $1 == "-y" ]]; then
|
||||||
noconfirm="--assume-yes"
|
noconfirm="--assume-yes"
|
||||||
@ -10,11 +9,11 @@ updatePackages() {
|
|||||||
if [[ $2 == "--full" ]]; then
|
if [[ $2 == "--full" ]]; then
|
||||||
full="full-"
|
full="full-"
|
||||||
fi
|
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 update;
|
||||||
sudo apt ${2}upgrade $1;
|
sudo apt ${2}upgrade $1;
|
||||||
sudo apt autoremove $1;
|
sudo apt autoremove $1;
|
Loading…
Reference in New Issue
Block a user