commit 97af7a9557f3aa5e358ae072e4955006095f62ec parent 5a4ba11f3db0ef1dde94681f51dcc827004c1e7a Author: Marcel <MTRNord@users.noreply.github.com> Date: Sat, 10 Mar 2018 21:55:43 +0100 Check if 64 or 32 bit Diffstat:
| M | snap/snapcraft.yaml | | | 9 | +++++---- |
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml @@ -32,12 +32,13 @@ parts: mkdir $GOPATH go get -u -d -v github.com/therecipe/qt/cmd/... export DISPLAY=:0 - 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 + if [ $(uname -m) == 'x86_64' ]; then 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; else 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; fi ls -la ./ ls -la ./qt-unified-linux-x64-online.run - chmod +x ./qt-unified-linux-x64-online.run - xvfb-run ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true - rm -f ./qt-unified-linux-x64-online.run + ls -la ./qt-unified-linux-x86-online.run + if [ $(uname -m) == 'x86_64' ]; then chmod +x ./qt-unified-linux-x64-online.run; else chmod +x qt-unified-linux-x86-online.run; fi + if [ $(uname -m) == 'x86_64' ]; then xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true; else xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true; fi + if [ $(uname -m) == 'x86_64' ]; then rm -f ./qt-unified-linux-x64-online.run; else rm -f ./qt-unified-linux-x86-online.run; fi export PKG_CONFIG_PATH=/opt/qt58/lib/pkgconfig export QT_DOC_DIR=/opt/qt58/doc export QT_MISC_DIR=/opt/qt58