CVS commit: pkgsrc/pkgtools/R2pkg/files

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Thu Mar  5 17:07:54 UTC 2020

Modified Files:
        pkgsrc/pkgtools/R2pkg/files: R2pkg.sh

Log Message:
Add a hyphen (-) to each stored argument so recursive calls work.

In order for recursive calls of R2pkg to work, they must receive the same
set of arguments as the original.  Previous argument handling stripped the
hyphen (-) from each argument; this explicitly restores it.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.sh
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.14 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.15
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.14   Mon Jan 13 18:06:47 2020
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.sh        Thu Mar  5 17:07:54 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: R2pkg.sh,v 1.14 2020/01/13 18:06:47 rillig Exp $
+# $NetBSD: R2pkg.sh,v 1.15 2020/03/05 17:07:54 brook Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -63,18 +63,18 @@ while getopts cDehqruVvE:M:L:P: arg
 do
     case $arg in
        # options without arguments
-       c) args="$args $arg"; update=false;;
-       D) args="$args $arg"; keep_description=yes;;
-       e) args="$args $arg"; use_editor=no;;
+       c) args="$args -$arg"; update=false;;
+       D) args="$args -$arg"; keep_description=yes;;
+       e) args="$args -$arg"; use_editor=no;;
        h) echo "$usage"; exit 0;;
-       q) args="$args $arg"; quiet=true;;
-       r) args="$args $arg"; recursive=true;;
-       u) args="$args $arg"; update=true;;
+       q) args="$args -$arg"; quiet=true;;
+       r) args="$args -$arg"; recursive=true;;
+       u) args="$args -$arg"; update=true;;
        V) echo "$name v$vers"; exit 0;;
-       v) args="$args $arg"; verbose=$((verbose + 1));;
+       v) args="$args -$arg"; verbose=$((verbose + 1));;
        # options taking arguments
-       E) args="$args $arg $OPTARG"; PKGEDITOR=$OPTARG;;
-       M) args="$args $arg $OPTARG"; maintainer_email=$OPTARG;;
+       E) args="$args -$arg $OPTARG"; PKGEDITOR=$OPTARG;;
+       M) args="$args -$arg $OPTARG"; maintainer_email=$OPTARG;;
        # options for recursion; only for internal use
        L) level=$((OPTARG + 0));;
        P) pid=$((OPTARG + 0));;