From eea22e84c8623ec398866786e7447ad8f9c5b800 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sun, 20 Feb 2022 15:38:05 +0100
Subject: [PATCH] improved arg parsing

---
 .../{build_all_tmp.xml => build_all.xml}      |  4 +--
 build-pkg/build-all                           | 36 ++++++++++++++-----
 build-pkg/pull-and-build-outdated             |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)
 rename .idea/runConfigurations/{build_all_tmp.xml => build_all.xml} (84%)

diff --git a/.idea/runConfigurations/build_all_tmp.xml b/.idea/runConfigurations/build_all.xml
similarity index 84%
rename from .idea/runConfigurations/build_all_tmp.xml
rename to .idea/runConfigurations/build_all.xml
index f7b2728..26ede1d 100644
--- a/.idea/runConfigurations/build_all_tmp.xml
+++ b/.idea/runConfigurations/build_all.xml
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="build-all tmp" type="ShConfigurationType">
+  <configuration default="false" name="build-all" type="ShConfigurationType">
     <option name="SCRIPT_TEXT" value="" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="$PROJECT_DIR$/build-pkg/build-all" />
-    <option name="SCRIPT_OPTIONS" value="pkglist.tmp" />
+    <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/build-pkg" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
diff --git a/build-pkg/build-all b/build-pkg/build-all
index 04879bf..1892343 100755
--- a/build-pkg/build-all
+++ b/build-pkg/build-all
@@ -69,20 +69,40 @@ function space_separated_to_array() {
   readarray -d " " -t ptr2 < <(printf '%s' "$ptr")
 }
 
+function usage() {
+  echo "Usage:
+  ${0} <PKGLIST-FILE> [-- <makepkgArguments>]
+  ${0} -- <makepkgArguments>
+With PKGLIST-FILE a file containing zero or more package names in each line, separated by space.
+All packages in a line will be built sequentially and are then synced to the remote repository
+before continuing with the next line.";
+  exit 1;
+}
+
 function main() {
 
   # parse arguments
   {
-    if [ $# -lt 1 ]; then
-      echo "Usage: ${0} <PKGLIST-FILE> [<makepkgArguments>]
-With PKGLIST-FILE a file containing zero or more package names in each line, separated by space.
-All packages in a line will be built sequentially and are then synced to the remote repository
-before continuing with the next line.";
-      exit 1;
+    if [ "${1}" == '-h' ] || [ "${1}" == '--help' ] ; then
+      usage
+    fi
+
+    if [ "${1}" == '--' ]; then
+      shift; # remove first arg
+    else
+      # If $1 not set or null, use 'pkglist.tmp'.
+      PKGLIST="${1:-pkglist.tmp}"
+
+      if [ $# -gt 1 ]; then
+        if [ "${2}" == '--' ]; then
+          shift; # remove first arg
+          shift; # remove second arg
+        else
+          usage
+        fi
+      fi
     fi
 
-    PKGLIST="${1}"
-    shift; # remove first arg
     MAKEPKG_ARGS=("$@")
   }
 
diff --git a/build-pkg/pull-and-build-outdated b/build-pkg/pull-and-build-outdated
index 854e7d1..204f80c 100755
--- a/build-pkg/pull-and-build-outdated
+++ b/build-pkg/pull-and-build-outdated
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 ../git-pull || exit $?
-./build-all pkglist.tmp || exit $?
+./build-all || exit $?
 echo '' > pkglist.tmp