diff options
| -rwxr-xr-x | bin/common-functions.sh | 1 | ||||
| -rw-r--r-- | bin/g-i-installation.sh | 16 |
2 files changed, 6 insertions, 11 deletions
diff --git a/bin/common-functions.sh b/bin/common-functions.sh index b8631473..cbc044f8 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -30,6 +30,7 @@ if [ "${0:0:5}" != "/tmp/" ] ; then # anytime...) # (setsid is not related to this hack. see commit log for 24deda5a8 it.) echo "$(date) - start running \"$0\" as \"$TTT\" using \"$@\" as arguments." + echo /srv/jenkins/bin/setsid.py $TTT "$@" exit $? # cleanup is done automatically via trap diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 15c23ccd..9d5c1d3d 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -76,8 +76,8 @@ fetch_if_newer() { echo "Downloading $url" curlopts="-L -s -S" if [ -f "$file" ] ; then - echo "$file exists, will only re-download if a newer one is available..." - ls $file + ls -l $file + echo "File exists, will only re-download if a newer one is available..." curlopts="$curlopts -z $file" fi curl $curlopts -o $file $url @@ -699,9 +699,7 @@ post_install_boot() { ;; 0910) do_and_report key space ;; - 0920) do_and_report type https - ;; - 0925) do_and_report key ":" # this will get a : + 0920) do_and_report type "https:" ;; 0930) do_and_report type "//www" ;; @@ -717,15 +715,11 @@ post_install_boot() { ;; 1020) do_and_report key space ;; - 1030) do_and_report type https - ;; - 1045) do_and_report key ";" # this will get a : + 1030) do_and_report type "https:" ;; 1050) do_and_report type "//www" ;; - 1060) do_and_report key ";" # this will get a : - ;; - 1070) do_and_report type "631" + 1070) do_and_report type ":631" ;; 1080) do_and_report key enter ;; |