Merge "Run package-intalls with py3k if we must"
This commit is contained in:
commit
af85ea066a
@ -6,9 +6,7 @@ fi
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
which which || install-packages which
|
||||
|
||||
python_path=$(which python2 || which python3)
|
||||
python_path=$(command -v python2 || command -v python3)
|
||||
if [ -z "$python_path" ]; then
|
||||
echo "Could not find python2 or python3 executable."
|
||||
exit 1
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/local/bin/dib-python
|
||||
|
||||
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
|
@ -1 +1,2 @@
|
||||
dib-python
|
||||
pkg-map
|
||||
|
@ -5,4 +5,6 @@ fi
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
sudo -E $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json
|
||||
python_path=$(command -v python2 || command -v python3)
|
||||
|
||||
sudo -E $python_path $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json
|
||||
|
Loading…
Reference in New Issue
Block a user