airship/treasuremap
Code Issues Proposed changes

Merge "Use zypper for package install on SUSE based distros"

Browse Source
This commit is contained in:
Zuul 2019-06-28 20:49:29 +00:00 committed by Gerrit Code Review
commit ff8a00725a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/airship
View File

@ -20,8 +20,11 @@ test -t 1 && test -t 0 && DEFAULT_TERM_OPTS='-it'
: ${TERM_OPTS:=${DEFAULT_TERM_OPTS}} : ${TERM_OPTS:=${DEFAULT_TERM_OPTS}}
# Python YAML module required to read versions.yaml # Python YAML module required to read versions.yaml
sudo dpkg -s python3-yaml &> /dev/null || sudo apt -y install python3-yaml if grep -iq suse /etc/os-release; then
rpm -q python3-pyaml --quiet || zypper --non-interactive install python3-pyaml
else
dpkg -s python3-yaml &> /dev/null || apt -y install python3-yaml
fi
ENV_FILE=$(mktemp) ENV_FILE=$(mktemp)
trap "{ rm -f $ENV_FILE; }" EXIT trap "{ rm -f $ENV_FILE; }" EXIT