From 3635ad61885ff4107e7dc070b28611d43a9b948e Mon Sep 17 00:00:00 2001 From: Shlomi Fish <shlomif@shlomifish.org> Date: Mon, 22 Oct 2018 10:55:05 +0300 Subject: [PATCH] avoid shell expansion. See https://shlomif-tech.livejournal.com/14671.html . --- contrib/install-pysolfc.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contrib/install-pysolfc.sh b/contrib/install-pysolfc.sh index ed587d7f..8fa52213 100755 --- a/contrib/install-pysolfc.sh +++ b/contrib/install-pysolfc.sh @@ -1,14 +1,15 @@ #! /bin/sh -Cefu : ${PKGTREE:=/usr/local/packages/PySolFC} -PIP=$(printf '%s/env/bin/pip install --no-binary :all: ' $PKGTREE) -PYPROG=$(printf '%s/env/bin/python' $PKGTREE) -VERSION=$(env PYTHONPATH=`pwd` $PYPROG -c 'from pysollib.settings import VERSION ; print(VERSION)' ) -XZBALL=$(printf 'dist/PySolFC-%s.tar.xz' $VERSION) -REQS='six random2 pillow' +PIP="$(printf '%s/env/bin/pip install --no-binary :all: ' "$PKGTREE")" +PYPROG="$(printf '%s/env/bin/python' "$PKGTREE")" +VERSION="$(env PYTHONPATH=`pwd` "$PYPROG" -c 'from pysollib.settings import VERSION ; print(VERSION)')" +XZBALL="$(printf 'dist/PySolFC-%s.tar.xz' "$VERSION")" +reqs='six random2 pillow' make dist -for req in $REQS ; do - $PIP $req +for req in $reqs +do + "$PIP" "$req" done -$PIP --upgrade $XZBALL +"$PIP" --upgrade "$XZBALL"