salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add nesting checks, remove all references to X

Browse Source
This commit is contained in:
Salt 2019-06-21 17:32:28 -05:00
parent 0c599a72f3
commit 2a3ecca2dc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firestarter
View File

@ -158,7 +158,7 @@ mate-settings-daemon
command -v gnome-settings-daemon command -v gnome-settings-daemon
gnome-settings-daemon gnome-settings-daemon
EOF EOF
# X system statistics glances # System statistics glances
cat << EOF > "$_configdir/stat-glances" cat << EOF > "$_configdir/stat-glances"
[ -z "\$DISPLAY" ] [ -z "\$DISPLAY" ]
: :
@ -259,6 +259,12 @@ Licensed under the MIT License
https://gitlab.com/rehashedsalt/firestarter https://gitlab.com/rehashedsalt/firestarter
EOF EOF
} }
step_check() {
if pgrep firestarter > /dev/null 2>&1 && [ -z "$dryrun" ]; then
err "Firestarter is already running" 61
fi
return 0
}
step_preexecute() { step_preexecute() {
# Special things that can't use simple configuration files # Special things that can't use simple configuration files
[ "$dryrun" = "1" ] && return 0 [ "$dryrun" = "1" ] && return 0
@ -424,6 +430,7 @@ main() {
;; ;;
esac esac
done done
step_check
step_preexecute step_preexecute
step_execute step_execute
step_wait step_wait