## Dialogs allow the user to install additional features.
##
-version="2023-03-11"
+version="2024-01-22"
description='
Geeqie is an image viewer.
This script will download, compile, and install Geeqie on Debian-based systems.
libimage-exiftool-perl
libheif (for HEIF support)
libheif-dev
-webp-pixbuf-loader (for WebP images)
-webp-pixbuf-loader
+libwebp (for WebP images)
+libwebp-dev
libdjvulibre (for DjVu images)
libdjvulibre-dev
libopenjp2 (for JP2 images)
libchamplain (for GPS maps)
libchamplain-0.12-dev
libpoppler (for pdf file preview)
-libpoppler-glib-dev"
+libpoppler-glib-dev
+libjxl (for viewing .jxl images)
+libjxl-dev"
####################################################################
# Get System Info
then
DIST="${DIST}[$(tr "\n" ' ' < /etc/UnitedLinux-release | sed s/VERSION.*//)]"
fi
- OS=$(lowercase $OS)
- DistroBasedOn=$(lowercase $DistroBasedOn)
+ OS=$(lowercase "$OS")
+ DistroBasedOn=$(lowercase "$DistroBasedOn")
readonly OS
readonly DIST
readonly DistroBasedOn
status=0
fi
fi
- return $status
+ return "$status"
}
package_install()
esac
done
-if [ "$LIST" ]
+if [ -n "$LIST" ]
then
printf '%b\n' "Essential libraries:"
for file in $essential_array
exit 1
fi" > "$install_pass_script"
chmod +x "$install_pass_script"
-export SUDO_ASKPASS=$install_pass_script
+export SUDO_ASKPASS="$install_pass_script"
if [ "$gtk_version" = "Uninstall" ]
then
uninstall
- exit
fi
# Put the install log in tmp, to avoid writing to PWD during a new install
i=$((i + 1))
done
-kill $zen_pid 2> /dev/null
+kill "$zen_pid" 2> /dev/null
# Ask the user which options to install
if [ -n "$option_string" ]
if [ "$mode" = "install" ]
then
- if ! git clone git://geeqie.org/geeqie.git >> "$install_log" 2>&1
+ if ! git clone http://git.geeqie.org/git/geeqie.git >> "$install_log" 2>&1
then
git_error=$(tail -n5 "$install_log" 2>&1)
zenity --title="$title" --width=370 --height=400 --error --text="Git error:\n\n$git_error" 2> /dev/null
printf '%b\n' "20" > "$zen_pipe"
printf '%b\n' "#Cleaning installed version..." > "$zen_pipe"
-if [ $mode = "install" ]
+if [ "$mode" = "install" ]
then
cd geeqie || exit 1
else
printf '%b\n' "30" > "$zen_pipe"
printf '%b\n' "#Checkout required version..." > "$zen_pipe"
-if [ "$BACK" ]
+if [ -n "$BACK" ]
then
if ! git checkout master~"$BACK" >> "$install_log" 2>&1
then
zenity --title="$title" --width=370 --height=400 --error --text="Git error:\n\n$git_error" 2> /dev/null
exit_install
fi
-elif [ "$COMMIT" ]
+elif [ -n "$COMMIT" ]
then
if ! git checkout "$COMMIT" >> "$install_log" 2>&1
zenity --title="$title" --width=370 --height=400 --error --text="Git error:\n\n$git_error" 2> /dev/null
exit_install
fi
-elif [ "$TAG" ]
+elif [ -n "$TAG" ]
then
if ! git checkout "$TAG" >> "$install_log" 2>&1
then
git_error=$(tail -n5 "$install_log" 2>&1)
zenity --title="$title" --width=370 --height=400 --error --text="Git error:\n\n$git_error" 2> /dev/null
exit_install
- exit
fi
fi
ninja -C build install
else
meson setup build
- meson configure build
+ meson configure --no-pager build
printf '%b\n' "90 " > "$zen_pipe"
printf '%b\n' "#Installing Geeqie..." > "$zen_pipe"
- ninja -C build install
+ sudo --askpass meson install -C build
fi
rm "$install_pass_script"