pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/R2pkg/files Add a hyphen (-) to each stored a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c455d2d6190
branches:  trunk
changeset: 412383:4c455d2d6190
user:      brook <brook%pkgsrc.org@localhost>
date:      Thu Mar 05 17:07:54 2020 +0000

description:
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.

diffstat:

 pkgtools/R2pkg/files/R2pkg.sh |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (38 lines):

diff -r 96170ba5fbfa -r 4c455d2d6190 pkgtools/R2pkg/files/R2pkg.sh
--- a/pkgtools/R2pkg/files/R2pkg.sh     Thu Mar 05 16:17:55 2020 +0000
+++ b/pkgtools/R2pkg/files/R2pkg.sh     Thu Mar 05 17:07:54 2020 +0000
@@ -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 @@
 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));;



Home | Main Index | Thread Index | Old Index