Various fixes from and inspired by Valery Smylov's testing

 - Legacy-Id: 19423

Author: larseggert

docker/build

@@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
 if [ "$progdir" = "." ]; then progdir="$PWD"; fi
 parent=$(dirname "$progdir")
 if [ "$parent" = "." ]; then parent="$PWD"; fi
+if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
 
 
 function usage() {
@@ -60,7 +61,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
 
 # Default values
 IMAGE=ietf/datatracker-environment
-TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}')")
+TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}') | tr -d '\r')")
 LOCAL=1
 
 # Option parsing

docker/copydb

@@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
 if [ "$progdir" = "." ]; then progdir="$PWD"; fi
 parent=$(dirname "$progdir")
 if [ "$parent" = "." ]; then parent="$PWD"; fi
+if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
 
 
 function usage() {
@@ -68,7 +69,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
 
 # Option parsing
 shortopts=hV
-args=$(getopt -o$shortopts $SV $*)
+args=$(getopt -o$shortopts $*)
 if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
 set -- $args
 

docker/rsync-extras

@@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
 if [ "$progdir" = "." ]; then progdir="$PWD"; fi
 parent=$(dirname "$progdir")
 if [ "$parent" = "." ]; then parent="$PWD"; fi
+if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
 
 
 function usage() {
@@ -61,7 +62,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
 
 # Option parsing
 shortopts=hvV
-args=$(getopt -o$shortopts $SV $*)
+args=$(getopt -o$shortopts $*)
 if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
 set -- $args
 

docker/run

@@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
 if [ "$progdir" = "." ]; then progdir="$PWD"; fi
 parent=$(dirname "$progdir")
 if [ "$parent" = "." ]; then parent="$PWD"; fi
+if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
 
 
 function usage() {
@@ -66,9 +67,8 @@ REPO="ietf/datatracker-environment"
 CACHED=':cached'
 
 # Option parsing
-shortopts=hp:VcC
-
-args=$(getopt -o$shortopts $SV $*)
+shortopts=cChp:V
+args=$(getopt -o$shortopts $*)
 if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
 set -- $args
 

docker/updatedb

@@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
 if [ "$progdir" = "." ]; then progdir="$PWD"; fi
 parent=$(dirname "$progdir")
 if [ "$parent" = "." ]; then parent="$PWD"; fi
+if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
 
 
 function usage() {
@@ -56,12 +57,12 @@ function version() {
 trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
 
 # Option parsing
-shortopts=DLZhqvV
+shortopts=DLZhV
 LOAD=1
 DOWNLOAD=1
 DROP=1
 
-args=$(getopt -o$shortopts $SV $*)
+args=$(getopt -o$shortopts $*)
 if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
 set -- $args