Fix installing packages and detecting installed packages

hawkeye116477 · Jan 26, 2022 · 62d0bcb · 62d0bcb
1 parent 2f26625
commit 62d0bcb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/install_waterfox.sh b/install_waterfox.sh
@@ -80,8 +80,8 @@ cd "$Dir" || exit
 echo "Detecting installable/installed packages..."
 mapfile -t Packages < <(find "$Dir" -type f -regextype posix-extended -regex ".*waterfox-(classic|current|G3|g3|G4|g4).*(tar\.bz2|AppImage)")
 
-if [[ ${#Packages[@]} -eq 0 && -d "$InstallDirectory" ]]; then
-    mapfile -t Packages < <(find "$InstallDirectory" -type d -regextype posix-extended -regex ".*waterfox-(classic|current|G3|g3|G4|g4)")
+if [[ -d "$InstallDirectory" ]]; then
+    mapfile -t -O "${#Packages[@]}" Packages < <(find "$InstallDirectory" -type d -regextype posix-extended -regex ".*waterfox-(classic|current|G3|g3|G4|g4)")
 fi
 
 if [ "${#Packages[@]}" ]; then
@@ -136,7 +136,7 @@ fi
 
 chosenPackages=()
 for package in "${Packages[@]}"; do
-    if [[ "$(basename -- "$package")" =~ ^waterfox-"$packageTypeName".*(tar\.bz2|AppImage) ]]; then
+    if [[ "$(basename -- "$package")" =~ ^waterfox-$packageTypeName.*(tar\.bz2|AppImage) ]]; then
         chosenPackages+=("$package")
     fi
 done