From e0a739199cea9babd4cb5f093e3ca133c87946ee Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 14 Oct 2021 10:54:53 +0000
Subject: [PATCH] Various fixes from and inspired by Valery Smylov's testing  -
 Legacy-Id: 19423

---
 docker/build        | 3 ++-
 docker/copydb       | 3 ++-
 docker/rsync-extras | 3 ++-
 docker/run          | 6 +++---
 docker/updatedb     | 5 +++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker/build b/docker/build
index 29a903b92..5354fbda8 100755
--- a/docker/build
+++ b/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
diff --git a/docker/copydb b/docker/copydb
index 27ac3b395..da7d03955 100755
--- a/docker/copydb
+++ b/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
 
diff --git a/docker/rsync-extras b/docker/rsync-extras
index 5cc7f9624..5a00d2be7 100755
--- a/docker/rsync-extras
+++ b/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
 
diff --git a/docker/run b/docker/run
index 87ab5511d..93a53ac1e 100755
--- a/docker/run
+++ b/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
 
diff --git a/docker/updatedb b/docker/updatedb
index 2fb9a7ed9..339c2911d 100755
--- a/docker/updatedb
+++ b/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