diff options
| author | Jan Palus | 2022-08-21 09:57:24 (GMT) |
|---|---|---|
| committer | Jan Palus | 2022-08-21 09:57:57 (GMT) |
| commit | 0954132a190c6303acc84d1b5891daa2d42a531c (patch) | |
| tree | 5648da400304500575c71188d6acf4d1e8dd0c63 | |
| parent | b3147be2f6673bdc95b063b5db7f8624203995c1 (diff) | |
| download | pld-builder.new-0954132a190c6303acc84d1b5891daa2d42a531c.zip pld-builder.new-0954132a190c6303acc84d1b5891daa2d42a531c.tar.gz | |
move python path to var and use it consistently; ver 1.90
| -rwxr-xr-x | client/make-request.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/make-request.sh b/client/make-request.sh index 90c07f9..62294c9 100755 --- a/client/make-request.sh +++ b/client/make-request.sh @@ -1,6 +1,6 @@ #!/bin/sh # vim:noet:ts=4:sw=4 -VERSION=1.89 +VERSION=1.90 # prevent "*" from being expanded in builders var set -f @@ -20,8 +20,9 @@ verbose=no autotag=no requester_override= relup=no +python=/usr/bin/python3 -if [ -x /usr/bin/python ]; then +if [ -x $python ]; then send_mode="python" else echo "No python present, using mail mode" @@ -101,7 +102,7 @@ send_request() { ;; *) msg "Sending using HTTP mode to $url" - cat - | python3 -c ' + cat - | $python -c ' import sys, socket from urllib import request @@ -606,7 +607,7 @@ esac # need to do this after dist selection if [ "$skip" ]; then - skip=$(skip="$skip" control_url="$control_url" python3 -c ' + skip=$(skip="$skip" control_url="$control_url" $python -c ' import sys import gzip import re |