diff options
| author | Joaquim Rocha <jrocha@endlessm.com> | 2017-12-11 10:55:14 +0000 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-19 20:59:34 +0000 |
| commit | 1c8dd13f55875507fa04978d7f3c5a9829f7ac06 (patch) | |
| tree | 9aab48427c049665c0da8e975db9bc47bd54fc03 /tests/make-test-app.sh | |
| parent | 516e249e509b85ce3c26832686809a6b528b1ae9 (diff) | |
| download | flatpak-1c8dd13f55875507fa04978d7f3c5a9829f7ac06.tar.gz | |
tests: Make the app ID in make-test-app.sh a parameter
This is in order to allow tests to make several apps if needed, and will
be useful when e.g. testing repos that have multiple apps with different
collection IDs.
This patch modifies the mentioned script as mentioned and updates the
places that call it.
Closes: #1587
Approved by: mwleeds
Diffstat (limited to 'tests/make-test-app.sh')
| -rwxr-xr-x | tests/make-test-app.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh index 08c04a35..597b6cd3 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh @@ -6,9 +6,15 @@ DIR=`mktemp -d` REPONAME=$1 shift +APP_ID=$1 +shift COLLECTION_ID=$1 shift +if [ x$APP_ID = x ]; then + APP_ID=org.test.Hello +fi + EXTRA="${1-}" ARCH=`flatpak --default-arch` @@ -16,7 +22,7 @@ ARCH=`flatpak --default-arch` # Init dir cat > ${DIR}/metadata <<EOF [Application] -name=org.test.Hello +name=$APP_ID runtime=org.test.Platform/$ARCH/master sdk=org.test.Platform/$ARCH/master EOF @@ -35,25 +41,25 @@ Version=1.0 Type=Application Name=Hello Exec=hello.sh -Icon=org.test.Hello +Icon=$APP_ID MimeType=x-test/Hello; EOF mkdir -p ${DIR}/files/share/icons/hicolor/64x64/apps -cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/ +cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/${APP_ID}.png cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/dont-export.png mkdir -p ${DIR}/files/share/icons/HighContrast/64x64/apps -cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/HighContrast/64x64/apps/ +cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/HighContrast/64x64/apps/${APP_ID}.png mkdir -p ${DIR}/files/share/app-info/xmls mkdir -p ${DIR}/files/share/app-info/icons/flatpak/64x64 -gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF +gzip -c > ${DIR}/files/share/app-info/xmls/${APP_ID}.xml.gz <<EOF <?xml version="1.0" encoding="UTF-8"?> <components version="0.8"> <component type="desktop"> - <id>org.test.Hello.desktop</id> - <name>Hello world test app</name> + <id>$APP_ID.desktop</id> + <name>Hello world test app: $APP_ID</name> <summary>Print a greeting</summary> <description><p>This is a test app.</p></description> <categories> @@ -63,7 +69,7 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF </component> </components> EOF -cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/ +cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/${APP_ID}.png if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} |