Build site bundle if does not exist, fix metainfo directory

decred · Dec 18, 2023 · 97a53e9 · 97a53e9
1 parent 9353436
commit 97a53e9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/client/cmd/dexc-desktop/pkg/pkg-debian.sh b/client/cmd/dexc-desktop/pkg/pkg-debian.sh
@@ -44,6 +44,15 @@ rm -fr "${BUILD_DIR}"
 mkdir -p -m 0755 "${CONTROL_DIR}"
 mkdir -p "${DOT_DESKTOP_BUILDDIR}"
 
+# check if site bundle is built, if not build it
+if [ ! -d ../../webserver/site/dist ]; then
+  CWD=$(pwd)
+  cd ../../webserver/site
+  npm clean-install
+  npm run build
+  cd $CWD
+fi
+
 # Build dexc
 LDFLAGS="-s -w -X main.Version=${VER}${META:++${META}}"
 GOOS=linux GOARCH=${ARCH} go build -o "${BIN_BUILDPATH}" -ldflags "$LDFLAGS"

diff --git a/client/cmd/dexc-desktop/snap/local/snapcraft.yaml.in b/client/cmd/dexc-desktop/snap/local/snapcraft.yaml.in
@@ -54,7 +54,7 @@ parts:
   metainfo:
     plugin: nil
     source: .
-    parse-info: [./metainfo/org.decred.dcrdex.metainfo.xml]
+    parse-info: [./src/org.decred.dcrdex.metainfo.xml]
 
   dexc-desktop:
     plugin: dump

diff --git a/...esktop/metainfo/org.decred.dcrdex.desktop → ...exc-desktop/src/org.decred.dcrdex.desktop b/...esktop/metainfo/org.decred.dcrdex.desktop → ...exc-desktop/src/org.decred.dcrdex.desktop
diff --git a/...p/metainfo/org.decred.dcrdex.metainfo.xml → ...esktop/src/org.decred.dcrdex.metainfo.xml b/...p/metainfo/org.decred.dcrdex.metainfo.xml → ...esktop/src/org.decred.dcrdex.metainfo.xml