--- scripts/pgallery/src/pgalleryindex.sh	2012/08/31 15:58:03	1.2
+++ scripts/pgallery/src/pgalleryindex.sh	2017/12/07 14:24:00	1.6
@@ -1,14 +1,15 @@
-#!/bin/sh
+#!/usr/local/libexec/pgallerysh
 #
-# THE BEER-WARE LICENSE 2012
+# THE BEER-WARE LICENSE 2012,13
+
 # <as@paefchen.net> wrote this file. As long as you retain this notice you
 # can do whatever you want with this stuff. If we meet some day, and you think
 # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #
-# $Paefchen: scripts/pgallery/src/pgalleryindex.sh,v 1.1 2012/08/31 12:33:07 as Exp $
+# $Paefchen: scripts/pgallery/src/pgalleryindex.sh,v 1.5 2013/04/03 08:33:29 as Exp $
 #
 
-. $(dirname $0)/libpgallery
+. /usr/local/libexec/libpgallery
 
 ARG_TITLE="PGallery"
 ARG_TNSIZE="180"
@@ -88,7 +89,7 @@ fi
 for n in $(set | awk -F= '{print $1}')
 do
 	echo "$n" | grep -q '^ARG_' || continue
-	eval "$n=\"\$(echo \"\$$n\" | iconv -f ISO-8859-1 -t UTF-8)\""
+	eval "$n=\"\$(echo \"\$$n\" | $BIN_ICONV -f ISO-8859-1 -t UTF-8)\""
 done
 
 title="$ARG_TITLE"
@@ -98,8 +99,11 @@ DIRS=
 for dir in $(find . -type d -maxdepth 1 -mindepth 1)
 do
 		test -f "$dir/$ARGFILE" || continue
+		ARG_INDEXIMG=
+		ARG_NOINDEX=
 		. "$dir/$ARGFILE"
 		test "$ARG_INDEXIMG" = "" && continue
+		test "$ARG_NOINDEX" != "" && continue
 		DIRS="$DIRS $dir"
 done