Apply remaining changes

Co-authored-by: kroese <5763256+kroese@users.noreply.github.com>

src/define.sh

@@ -291,7 +291,7 @@ getLanguage() {
       lang="Polish"
       culture="pl-PL" ;;
     "br" | "pt" | "pt-br" | "portuguese" | "português" | "portugues" )
-      [[ "$input" == "pt-br" ]] || id="pt-br"
+      [[ "$input" != "pt-br" ]] && id="pt-br"
       short="pt"
       lang="Brazilian Portuguese"
       desc="Portuguese"

src/install.sh

@@ -274,7 +274,7 @@ startInstall() {
 
   skipInstall "$BOOT" "$previousBase" && return 1
 
-  if [ -z "$previousBase" ] && hasData; then
+  if [ -z "$previousBase" ] && hasDisk; then
     if ! backupPrevious ""; then
       warn "the backup was incomplete, continuing with installation..."
     fi
@@ -418,7 +418,7 @@ skipInstall() {
     # existing installation, but discard stale media when no disk exists yet.
     if [[ "${STORAGE,,}/${previousBase,,}" != "${iso,,}" ]]; then
 
-      if ! hasData; then
+      if ! hasDisk; then
 
         if ! rm -f -- "$STORAGE/$previousBase"; then
           error "Failed to remove ISO file \"$STORAGE/$previousBase\" !"
@@ -538,7 +538,7 @@ findFile() {
   fi
 
   if [ -d "$dir" ]; then
-    if ! hasDisk || [ ! -f "$boot" ]; then
+    if ! hasData || [ ! -f "$boot" ]; then
       error "The bind $dir maps to a file that does not exist!" && return 1
     fi
   fi

src/power.sh

@@ -483,7 +483,7 @@ gracefulShutdown() {
 
   code=$(signalCode "$sig")
 
-  if (( SHUTDOWN_SIGNAL != 0 )); then
+  if [ -f "$QEMU_END" ]; then
 
     # A second Ctrl-C during an active shutdown skips the remaining grace period
     # and lets the shutdown loop force QEMU down immediately.
@@ -497,13 +497,12 @@ gracefulShutdown() {
     return
   fi
 
-  SHUTDOWN_SIGNAL=$code
-
   # Signal handlers must complete their own error handling and cleanup without
   # errexit terminating the shell partway through the shutdown sequence.
   set +e
-  touch "$QEMU_END"
+  SHUTDOWN_SIGNAL=$code
 
+  touch "$QEMU_END"
   echo && info "Received $sig signal, sending ACPI shutdown signal..."
 
   # Interactive startup may receive a signal before the PID file appears, so

testfile

@@ -0,0 +1 @@
+abc