mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-20 21:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

playing with the look of the dialog

Browse Source
This commit is contained in:
Bart Reardon
2022-07-26 13:12:15 +10:00
parent 18638141b6
commit 84e0d5d263
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fragments/functions.sh
View File

@@ -118,9 +118,11 @@ printlog(){
if [[ "$(whoami)" == "root" ]]; then if [[ "$(whoami)" == "root" ]]; then
echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}" | tee -a $log_location echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}" | tee -a $log_location
updateDialogProgressText "${logmessage}" "$DIALOGCMDFILE" updateDialogProgressText "${logmessage}" "$DIALOGCMDFILE"
updateDialogProgress "increment" "$DIALOGCMDFILE"
else else
echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}" echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}"
updateDialogProgressText "${logmessage}" "$DIALOGCMDFILE" updateDialogProgressText "${logmessage}" "$DIALOGCMDFILE"
updateDialogProgress "increment" "$DIALOGCMDFILE"
fi fi
done <<< "$log_message" done <<< "$log_message"
fi fi
@@ -949,20 +951,22 @@ launchDialog() {
log="/var/tmp/dialog.log" log="/var/tmp/dialog.log"
fi fi
# check for laptop or desktop # check for laptop or desktop
if /usr/bin/pmset -g batt | grep -iq "battery"; then #if /usr/bin/pmset -g batt | grep -iq "battery"; then
icon="SF=laptopcomputer.and.arrow.down" # icon="SF=laptopcomputer.and.arrow.down"
else #else
icon="SF=desktopcomputer.and.arrow.down" # icon="SF=desktopcomputer.and.arrow.down"
fi #fi
icon="SF=arrow.down.to.line,colour=green,bgcolour=white,weight=regular"
# launch dialog # launch dialog
/usr/local/bin/dialog --progress 100 -o \ /usr/local/bin/dialog --progress 100 -o \
--title "Installing $name" \ --title "none" \
--message "Please wait while $name installs..." \ --message "## Installing $name\n\nPlease wait..." \
--progress 150 \
--alignment centre \ --alignment centre \
--icon "$icon" \ --icon "$LOGO" \
--iconsize 100 \ --overlayicon "$icon" \
--height 300 --width 550 \ --height 350 --width 550 \
--centreicon \ --centreicon \
--position bottomright \ --position bottomright \
--button1disabled \ --button1disabled \