fix bats second try

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

Author: openhabian

functions/packages.bash

@@ -939,8 +939,8 @@ install_grott() {
   fi
   local installType="$1"
 
-  # In non- interactive mode, skip setup unless openhabian.config grottSetupEnabled == true
-  if [[ -z "$INTERACTIVE" ]] && { [[ -z "$grottSetupEnabled" ]] || [[ "$grottSetupEnabled" != "true" ]]; }; then
+  # Skip setup if in un-attended mode and openhabian.config grottSetupEnabled is missing or not true
+  if [[ -n "$UNATTENDED" ]] && { [[ -z "$grottSetupEnabled" ]] || [[ "$grottSetupEnabled" != "true" ]]; }; then
     echo "$(timestamp) [openHABian] Setup Grott Proxy... SKIPPED (setup not enabled)"
     return 0
   fi

functions/packages.bats

@@ -67,9 +67,6 @@ teardown_file() {
 }
 
 @test "destructive-grott_install" {
-  # Force unattended install
-  grottSetupEnabled=true
-
   ## Confirm Grott Proxy install completes without error
   echo -e "# ${COL_CYAN}$(timestamp) [openHABian] Grott Proxy installation starting...${COL_DEF}" >&3
   run install_grott "install" 3>&-