morpheus

commit a7176d82d42224d1423da7ba38921c92d0763c89
parent 3618dba37e3700498b4ec6aab5be0833d9ffef17
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Sat, 10 Mar 2018 23:02:54 +0100

Another try on fixing the if
Diffstat:
M
snap/snapcraft.yaml
 | 
28
++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -7,6 +7,10 @@ description: |
 grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: devmode # use 'strict' once you have the right plugs and slots
 
+architectures:
+  - amd64
+  - i386
+
 apps:
   morpheus:
     command: morpheus
@@ -24,8 +28,6 @@ parts:
       - xvfb
       - software-properties-common
     build: |
-      test "$SNAP_ARCH" = "armhf" && exit 0
-      test "$SNAP_ARCH" = "arm64" && exit 0
       add-apt-repository -y ppa:gophers/archive
       apt-get -qq update
       apt-get -y -qq install golang-1.9-go
@@ -34,17 +36,17 @@ parts:
       mkdir $GOPATH
       go get -u -d -v github.com/therecipe/qt/cmd/...
       export DISPLAY=:0
-      test "$SNAP_ARCH = 'amd64' && 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 "$SNAP_ARCH = '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 "$(arch)" = "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 "$(arch)" = "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 ./
-      test "$SNAP_ARCH" = "amd64" && ls -la ./qt-unified-linux-x64-online.run
-      test "$SNAP_ARCH" = "i386" && ls -la ./qt-unified-linux-x86-online.run
-      test "$SNAP_ARCH" = "amd64" && chmod +x ./qt-unified-linux-x64-online.run
-      test "$SNAP_ARCH" = "i386" && chmod +x qt-unified-linux-x86-online.run
-      test "$SNAP_ARCH" = "amd64" && xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true
-      test "$SNAP_ARCH" = "i386" && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true
-      test "$SNAP_ARCH" = "amd64" && rm -f ./qt-unified-linux-x64-online.run
-      test "$SNAP_ARCH" = "i386" && rm -f ./qt-unified-linux-x86-online.run
+      test "$(arch)" = "x86_64" && ls -la ./qt-unified-linux-x64-online.run
+      test "$(arch)" = "i386" && ls -la ./qt-unified-linux-x86-online.run
+      test "$(arch)" = "x86_64" && chmod +x ./qt-unified-linux-x64-online.run
+      test "$(arch)" = "i386" && chmod +x qt-unified-linux-x86-online.run
+      test "$(arch)" = "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 "$(arch)" = "i386" && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true
+      test "$(arch)" = "x86_64" && rm -f ./qt-unified-linux-x64-online.run
+      test "$(arch)" = "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
@@ -58,8 +60,6 @@ parts:
       dep ensure
       $GOPATH/bin/qtdeploy build linux
     install: |
-      test "$SNAP_ARCH" = "armhf" && exit 0
-      test "$SNAP_ARCH" = "arm64" && exit 0
       mv .circleci/Morpheus.sh $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh
       sed -i -e 's/$appname/Morpheus_bin/g' $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh
       ln -s $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus