diff --git a/Makefile b/Makefile index c06fb77d800d459ff01573b940c125e82a67d39d..01bb9acee56db2836b9932a7895e3b3a79189c79 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL = /bin/sh -TARGET = ocs-store +TARGET = pling-store srcdir = . DESTDIR = diff --git a/app/images/icon.css b/app/images/icon.css index f457b9e7bc219ada31b8128bd3290faef16df5f1..4d006b87376286510d4720f19fde1a4a8b5efd9c 100644 --- a/app/images/icon.css +++ b/app/images/icon.css @@ -1,3 +1,3 @@ -.icon-ocs-store { +.icon-pling-store { background-image: url(app-icons/pling-store.svg); } diff --git a/app/main.js b/app/main.js index ca5172797b7b7c2e0a0066fcbf1c0d5607202877..0d1c28d45d57e2e9686f4cf528e7277d5aa6bc43 100644 --- a/app/main.js +++ b/app/main.js @@ -11,7 +11,7 @@ const ocsManagerConfig = require('./configs/ocs-manager.json'); const isDebugMode = process.argv.includes('--debug'); const previewpicDirectory = `${app.getPath('userData')}/previewpic`; -const windowIcon = `${__dirname}/images/app-icons/ocs-store.png`; +const windowIcon = `${__dirname}/images/app-icons/pling-store.png`; const indexFileUrl = `file://${__dirname}/index.html`; const appConfigStoreStorage = 'application'; diff --git a/app/scripts/components/AboutdialogComponent.js b/app/scripts/components/AboutdialogComponent.js index 888da734bd8d6947d7ce5ddf42dad1041817008d..51486fbb698abe370b54c42cf6ad890d0881c006 100644 --- a/app/scripts/components/AboutdialogComponent.js +++ b/app/scripts/components/AboutdialogComponent.js @@ -41,7 +41,7 @@ export default class AboutdialogComponent extends BaseComponent { padding: 1em; text-align: center; } - div[slot="content"] figure.icon-ocs-store { + div[slot="content"] figure.icon-pling-store { display: inline-block; width: 128px; height: 128px; @@ -58,7 +58,7 @@ export default class AboutdialogComponent extends BaseComponent { <app-dialog data-width="500px" data-footer-state="inactive"> <h3 slot="header">About This App</h3> <div slot="content"> - <figure class="icon-ocs-store"></figure> + <figure class="icon-pling-store"></figure> <h4>${this.state.productName}</h4> <p>Version ${this.state.version}</p> <p>${this.state.description}</p> diff --git a/app/scripts/components/SplashscreenComponent.js b/app/scripts/components/SplashscreenComponent.js index 134848fd853b116bcc61e10af4d50459511ad3c1..dcf7ce5057704ca7aafae939484b4d1e703ce261 100644 --- a/app/scripts/components/SplashscreenComponent.js +++ b/app/scripts/components/SplashscreenComponent.js @@ -31,7 +31,7 @@ export default class SplashscreenComponent extends BaseComponent { align-items: center; justify-content: center; } - div[slot="content"] figure.icon-ocs-store { + div[slot="content"] figure.icon-pling-store { display: inline-block; width: 128px; height: 128px; @@ -47,7 +47,7 @@ export default class SplashscreenComponent extends BaseComponent { <app-dialog data-width="400px" data-height="300px" data-state="active" data-header-state="inactive" data-footer-state="inactive" data-auto-close-state="inactive"> <div slot="content"> - <figure class="icon-ocs-store"></figure> + <figure class="icon-pling-store"></figure> <h3>Welcome to ${document.title}</h3> <p>Loading...</p> </div> diff --git a/desktop/ocs-store.desktop b/desktop/pling-store.desktop similarity index 64% rename from desktop/ocs-store.desktop rename to desktop/pling-store.desktop index b926e0a5f6cc77c135aaee359cf4dd5879c1f392..48750e2d4207d9a9aac4e6dadf770e884b959fad 100644 --- a/desktop/ocs-store.desktop +++ b/desktop/pling-store.desktop @@ -1,7 +1,7 @@ [Desktop Entry] -Name=OCS-Store -Exec=ocs-store -Icon=ocs-store +Name=Pling-Store +Exec=pling-store +Icon=pling-store Type=Application Terminal=false NoDisplay=false diff --git a/desktop/ocs-store.svg b/desktop/pling-store.svg similarity index 100% rename from desktop/ocs-store.svg rename to desktop/pling-store.svg diff --git a/launcher/ocs-store b/launcher/ocs-store deleted file mode 100644 index fa50f4be28e3c1ce5140e7ee0bc8f72cbcf8fb96..0000000000000000000000000000000000000000 --- a/launcher/ocs-store +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Newer openssl workaround -export OPENSSL_CONF=/etc/ssl/ - -PREFIX="$(cd "$(dirname "${0}")" && pwd)" - -if [ ${APPIMAGE} ]; then - export PATH=${PREFIX}/usr/local/bin:${PREFIX}/usr/bin:${PATH} -fi - -if [ -f "${PREFIX}/ocs-store-linux-x64/ocs-store" ]; then - ${PREFIX}/ocs-store-linux-x64/ocs-store -elif [ -f "${PREFIX}/usr/local/lib/ocs-store-linux-x64/ocs-store" ]; then - ${PREFIX}/usr/local/lib/ocs-store-linux-x64/ocs-store -elif [ -f "${PREFIX}/usr/lib/ocs-store-linux-x64/ocs-store" ]; then - ${PREFIX}/usr/lib/ocs-store-linux-x64/ocs-store -elif [ -f "${PREFIX}/../lib/ocs-store-linux-x64/ocs-store" ]; then - ${PREFIX}/../lib/ocs-store-linux-x64/ocs-store -else - exit 1 -fi diff --git a/launcher/pling-store b/launcher/pling-store new file mode 100644 index 0000000000000000000000000000000000000000..8e97700a7d94c4883234d54506229159996a06eb --- /dev/null +++ b/launcher/pling-store @@ -0,0 +1,22 @@ +#!/bin/bash + +# Newer openssl workaround +export OPENSSL_CONF=/etc/ssl/ + +PREFIX="$(cd "$(dirname "${0}")" && pwd)" + +if [ ${APPIMAGE} ]; then + export PATH=${PREFIX}/usr/local/bin:${PREFIX}/usr/bin:${PATH} +fi + +if [ -f "${PREFIX}/pling-store-linux-x64/pling-store" ]; then + ${PREFIX}/pling-store-linux-x64/pling-store +elif [ -f "${PREFIX}/usr/local/lib/pling-store-linux-x64/pling-store" ]; then + ${PREFIX}/usr/local/lib/pling-store-linux-x64/pling-store +elif [ -f "${PREFIX}/usr/lib/pling-store-linux-x64/pling-store" ]; then + ${PREFIX}/usr/lib/pling-store-linux-x64/pling-store +elif [ -f "${PREFIX}/../lib/pling-store-linux-x64/pling-store" ]; then + ${PREFIX}/../lib/pling-store-linux-x64/pling-store +else + exit 1 +fi diff --git a/package-lock.json b/package-lock.json index 7b3dcee6c81b20aa6b13a85ae2e146e9258321e2..7bff7ef7441bec99bc7b5598a24083b2cb8a5a1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ocs-store", + "name": "pling-store", "version": "4.1.1", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 8e07a911b0af5c8a37545df56fea78618d362f40..58becb835b2ef53ccddb4b9163ccf34c20fb00e4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pling-store", "productName": "Pling-Store", - "version": "4.1.1", + "version": "5.0.0", "description": "Store Frontend and Management Application based on OpenCollaborationServices (OCS) of Opendesktop.org.", "author": "Pling.com", "license": "GPL-3.0", @@ -12,7 +12,7 @@ "scripts": { "start": "electron .", "debug": "electron . --debug", - "package": "electron-packager . ocs-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild)($|/)'" + "package": "electron-packager . pling-store --platform=linux --arch=x64 --out=dist --overwrite --ignore='^/(\\.gitignore|\\.gitlab\\-ci\\.yml|Makefile|README\\.md|desktop|launcher|pkg|scripts|appimagebuild)($|/)'" }, "dependencies": { "electron-store": "2.*.*", diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild old mode 100644 new mode 100755 index ac92b49ff1e8bccecee2d388378b05a18100fcd2..b32afe679e68c6b437adfe6e44fb5c9c10c06eab --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -4,7 +4,7 @@ PKGNAME='pling-store' PKGVER='5.0.0' PKGREL='1' -UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/ocs-store-x86_64.AppImage.zsync' +UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/pling-store-x86_64.AppImage.zsync' APPDIR="${PKGNAME}.AppDir" make @@ -14,10 +14,10 @@ install -D -m 755 ${APPDIR}/usr/bin/${PKGNAME} ${APPDIR}/AppRun install -D -m 644 ${APPDIR}/usr/share/applications/${PKGNAME}.desktop ${APPDIR}/${PKGNAME}.desktop install -D -m 644 ${APPDIR}/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg ${APPDIR}/${PKGNAME}.svg -install -D -m 755 /usr/lib/x86_64-linux-gnu/libgconf-2.so.4 ${APPDIR}/usr/lib/ocs-store-linux-x64/libgconf-2.so.4 -install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/ocs-store-linux-x64/libXss.so.1 -install -D -m 755 /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/libcanberra-gtk-module.so ${APPDIR}/usr/lib/ocs-store-linux-x64/libcanberra-gtk-module.so -install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/lib/ocs-store-linux-x64/libgnome-keyring.so.0 +install -D -m 755 /usr/lib/x86_64-linux-gnu/libgconf-2.so.4 ${APPDIR}/usr/lib/pling-store-linux-x64/libgconf-2.so.4 +install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/pling-store-linux-x64/libXss.so.1 +install -D -m 755 /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/libcanberra-gtk-module.so ${APPDIR}/usr/lib/pling-store-linux-x64/libcanberra-gtk-module.so +install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/lib/pling-store-linux-x64/libgnome-keyring.so.0 curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/d3dc42436b82d11360ebc96b38d4aaf4/ocs-manager-0.8.1-1-x86_64.AppImage install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager diff --git a/scripts/package b/scripts/package old mode 100644 new mode 100755 index 3116e5a708e3e31c14a4e95856896c870b4433e6..895b12e8148c45997996ca05b40925f79086a8e0 --- a/scripts/package +++ b/scripts/package @@ -1,6 +1,6 @@ #!/bin/bash -PKGNAME='ocs-store' +PKGNAME='pling-store' PKGUSER='pkgbuilder'