From 49e8290a42296ab2451d976cd3b098d4175bdd2e Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Thu, 22 Aug 2019 13:05:10 -0500 Subject: [PATCH] Rename other ocurrences of the ocs-store --- Makefile | 2 +- app/images/icon.css | 2 +- app/main.js | 2 +- app/scripts/components/AboutdialogComponent.js | 4 ++-- app/scripts/components/SplashscreenComponent.js | 4 ++-- .../{ocs-store.desktop => pling-store.desktop} | 6 +++--- desktop/{ocs-store.svg => pling-store.svg} | 0 launcher/ocs-store | 16 ++++++++-------- package-lock.json | 2 +- package.json | 8 ++++---- pkg/appimage/appimagebuild | 8 ++++---- 11 files changed, 27 insertions(+), 27 deletions(-) rename desktop/{ocs-store.desktop => pling-store.desktop} (64%) rename desktop/{ocs-store.svg => pling-store.svg} (100%) diff --git a/Makefile b/Makefile index c06fb77..01bb9ac 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 f457b9e..4d006b8 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 ca51727..0d1c28d 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 888da73..51486fb 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 134848f..dcf7ce5 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 b926e0a..48750e2 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 index fa50f4b..8e97700 100644 --- a/launcher/ocs-store +++ b/launcher/ocs-store @@ -9,14 +9,14 @@ 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 +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 7b3dcee..7bff7ef 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 c62bd3b..8d70ca3 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { "name": "pling-store", - "productName": "OCS-Store", + "productName": "Pling-Store", "version": "4.1.1", "description": "Store Frontend and Management Application based on OpenCollaborationServices (OCS) of Opendesktop.org.", "author": "Opendesktop.org", "license": "GPL-3.0", "homepage": "https://www.opendesktop.org/", - "repository": "https://git.opendesktop.org/akiraohgaki/ocs-store", - "bugs": "https://git.opendesktop.org/akiraohgaki/ocs-store/issues", + "repository": "https://git.opendesktop.org/akiraohgaki/pling-store", + "bugs": "https://git.opendesktop.org/akiraohgaki/pling-store/issues", "main": "app/main.js", "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 index 56b32e1..1137902 100755 --- a/pkg/appimage/appimagebuild +++ b/pkg/appimage/appimagebuild @@ -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 -- GitLab