commit e6cf59dc7f87f01fba1bd139a5c87b35343bdf88 parent de982a457e1629854f105942b0a1bb04105aede8 Author: Marcel <MTRNord@users.noreply.github.com> Date: Sat, 10 Mar 2018 22:18:11 +0100 Use uname -i Diffstat:
| M | snap/snapcraft.yaml | | | 20 | ++++++++++---------- |
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml @@ -32,17 +32,17 @@ parts: mkdir $GOPATH go get -u -d -v github.com/therecipe/qt/cmd/... export DISPLAY=:0 - test $(uname -m) = 'x86_64' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x64-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run - test $(uname -m) = 'i386' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x86-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x86-online.run + test $(uname -i) = 'x86_64' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x64-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run + test $(uname -i) = 'i386' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x86-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x86-online.run ls -la ./ - ls -la ./qt-unified-linux-x64-online.run - ls -la ./qt-unified-linux-x86-online.run - test $(uname -m) = 'x86_64' && chmod +x ./qt-unified-linux-x64-online.run - test $(uname -m) = 'i386' && chmod +x qt-unified-linux-x86-online.run - test $(uname -m) = 'x86_64' && xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true - test $(uname -m) = 'i386' && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true - test $(uname -m) = 'x86_64' && rm -f ./qt-unified-linux-x64-online.run - test $(uname -m) = 'i386' && rm -f ./qt-unified-linux-x86-online.run + test $(uname -i) = 'x86_64' && ls -la ./qt-unified-linux-x64-online.run + test $(uname -i) = 'i386' && ls -la ./qt-unified-linux-x86-online.run + test $(uname -i) = 'x86_64' && chmod +x ./qt-unified-linux-x64-online.run + test $(uname -i) = 'i386' && chmod +x qt-unified-linux-x86-online.run + test $(uname -i) = 'x86_64' && xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true + test $(uname -i) = 'i386' && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true + test $(uname -i) = 'x86_64' && rm -f ./qt-unified-linux-x64-online.run + test $(uname -i) = 'i386' && rm -f ./qt-unified-linux-x86-online.run export PKG_CONFIG_PATH=/opt/qt58/lib/pkgconfig export QT_DOC_DIR=/opt/qt58/doc export QT_MISC_DIR=/opt/qt58