* packaging/macosx/osx-app.sh: Improve the comand line option processing.

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index cdd4359cc47a521a7ad41fde071ba607ada3eb97..6fc9980c6f777d0d02c1e42817b754baf31aabc0 100755 (executable)
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -71,27 +71,29 @@ fi
 pkg=Inkscape
 package="$pkg.app"
 
-# TODO: Rewrite handling of command line args and make more robust.
 
 strip=false
-if [ "$1" = "-s" ]; then
-       strip=true
-       shift
-fi
+while getopts 's' flag; do
+       case $flag in
+               s)  strip=true ;;
+               \?) echo "Invalid command line option."; exit 1 ;;
+               *)  echo "Internal error in getopts."; exit 2 ;;
+       esac
+done
+shift `expr $OPTIND - 1`;
+
 
 binary="$1"
 if [ ! -x "$binary" ]; then
         echo "Not executable: $binary" >&2
         exit 1
 fi
-shift
 
-plist="$1"
+plist="$2"
 if [ ! -f "$plist" ]; then
        echo "Need plist file" >&2
        exit 1
 fi
-shift
 
 # Set the 'macosx' directory, usually the current directory.
 resdir=`pwd`