Simplify vflist_get_formatted()

[geeqie.git] / geeqie-install-debian.sh

diff --git a/geeqie-install-debian.sh b/geeqie-install-debian.sh
index c6e4689..88fde4d 100755 (executable)
--- a/geeqie-install-debian.sh
+++ b/geeqie-install-debian.sh
@@ -8,7 +8,7 @@
 ## Dialogs allow the user to install additional features.
 ##
 
-version="2023-06-11"
+version="2024-01-22"
 description='
 Geeqie is an image viewer.
 This script will download, compile, and install Geeqie on Debian-based systems.
@@ -71,8 +71,8 @@ libimage-exiftool-perl (for jpeg extraction plugin)
 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)
@@ -488,7 +488,7 @@ printf '%b\n' "#Getting new sources from server..." > "$zen_pipe"
 
 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
@@ -560,10 +560,10 @@ then
        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"