Commit867fe2f

committed

use the log functions for errors and status messages

This causes the error messages to go to standard error, and it makesit easy to prefix all log messages if desired.

1 parent7c0e443 commit867fe2fCopy full SHA for 867fe2f

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,14 @@ PY_VER=2`
`29`	`29`	`whilegetopts :p: opt"$@";do`
`30`	`30`	`case$optin`
`31`	`31`	`p) PY_VER=$OPTARG;;`
`32`		`-*)echo"Unknown option:$opt";exit 1;;`
	`32`	`+*)fatal"Unknown option:$opt";;`
`33`	`33`	`esac`
`34`	`34`	`done`
`35`	`35`
`36`	`36`	`case$PY_VERin`
`37`	`37`	`2) VENV_CMD=virtualenv;;`
`38`	`38`	`3) VENV_CMD=pyvenv;;`
`39`		`-*)echo"Wrong python version (2 or 3)";exit 1;;`
	`39`	`+*)fatal"Wrong python version (2 or 3)";;`
`40`	`40`	`esac`
`41`	`41`
`42`	`42`	`VENV=$(pwd)/.venv`
`@@ -63,7 +63,7 @@ GREEN='\033[0;32m'`
`63`	`63`	`NC='\033[0m'`
`64`	`64`	`OK="echo -e${GREEN}OK${NC}"`
`65`	`65`
`66`		`-echo -n"Waiting for gitlab to come online..."`
	`66`	`+log"Waiting for gitlab to come online..."`
`67`	`67`	`I=0`
`68`	`68`	`while:;do`
`69`	`69`	`sleep 5`
`@@ -73,7 +73,6 @@ while :; do`
`73`	`73`	`[$I-eq 120 ]&&exit 1`
`74`	`74`	`done`
`75`	`75`	`sleep 5`
`76`		`-$OK`
`77`	`76`
`78`	`77`	`# Get the token`
`79`	`78`	`TOKEN=$(curl -s http://localhost:8080/api/v3/session \`
`@@ -92,8 +91,8 @@ url = http://localhost:8080`
`92`	`91`	`private_token =$TOKEN`
`93`	`92`	`EOF`
`94`	`93`
`95`		`-echo"Config file content ($CONFIG):"`
`96`		`-cat$CONFIG`
	`94`	`+log"Config file content ($CONFIG):"`
	`95`	`+log<$CONFIG`
`97`	`96`
`98`	`97`	`$VENV_CMD$VENV`
`99`	`98`	`.$VENV/bin/activate`

Comments

(0)