altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Various fixes from and inspired by Valery Smylov's testing

Browse source 
- Legacy-Id: 19423
This commit is contained in:
Lars Eggert 2021-10-14 10:54:53 +00:00
parent a3f0b1533f
commit e0a739199c
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/build
View file

@ -7,6 +7,7 @@ if [ "$progdir" = "$program" ]; then progdir="."; fi
if [ "$progdir" = "." ]; then progdir="$PWD"; fi if [ "$progdir" = "." ]; then progdir="$PWD"; fi
parent=$(dirname "$progdir") parent=$(dirname "$progdir")
if [ "$parent" = "." ]; then parent="$PWD"; fi if [ "$parent" = "." ]; then parent="$PWD"; fi
if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
function usage() { function usage() {
@ -60,7 +61,7 @@ trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)";
# Default values # Default values
IMAGE=ietf/datatracker-environment 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 LOCAL=1
# Option parsing # Option parsing

3
docker/copydb
View file

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

3
docker/rsync-extras
View file

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

6
docker/run
View file

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

5
docker/updatedb
View file

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