Procfile

+react: npm start
+electron: node src/electron-wait-react
\ No newline at end of file

app/main.js

@@ -32,7 +32,8 @@ async function startOcsManager() {
             }
         };
 
-        ocsManager = spawn(ocsManagerConfig.bin, ['-p', ocsManagerConfig.port]);
+        ocsManager = spawn(ocsManagerConfig.bin, ['-p', ocsManagerConfig.port, '--appFile', process.env.APPIMAGE]);
+
 
         ocsManager.stdout.on('data', (data) => {
             console.log(`[${ocsManagerConfig.bin}] ${data}`);
@@ -92,15 +93,6 @@ function createWindow() {
 
     mainWindow.loadURL(indexFileUrl);
     mainWindow.maximize();
-
-    console.log('should check for updates')
-
-    require('update-electron-app')({
-        repo: 'dfn2/pling-store',
-        host: 'http://www.opencode.net',
-        updateInterval: '1 hour',
-        logger: require('electron-log')
-    })
     
     mainWindow.on('close', () => {
         const appConfigStore = new ElectronStore({name: appConfigStoreStorage});
@@ -227,6 +219,12 @@ ipcMain.on('store', (event, key, value) => {
     event.returnValue = key ? appConfigStore.get(key) : appConfigStore.store;
 });
 
+ipcMain.on('checkForUpdates', () => {
+    // TODO -> add check for updates method?
+    ocsManager = spawn(ocsManagerConfig.bin, ['-p', ocsManagerConfig.port, '--appFile', process.env.APPIMAGE]);
+    console.log(ocsManager);
+});
+
 ipcMain.on('previewpic', (event, kind, itemKey, url) => {
     if (kind === 'directory') {
         event.returnValue = previewpicDirectory;

app/scripts/components/ToolbarComponent.js

 import BaseComponent from './common/BaseComponent.js';
+const {ipcRenderer} = require('electron');
 
 export default class ToolbarComponent extends BaseComponent {
 
     init() {
         this.contentRoot.addEventListener('click', this._handleClick.bind(this));
-
+        this._ipcRenderer = ipcRenderer;
         this._viewHandler_webview_loading = this._viewHandler_webview_loading.bind(this);
         this._viewHandler_webview_page = this._viewHandler_webview_page.bind(this);
         this._viewHandler_ocsManager_updateAvailableItems = this._viewHandler_ocsManager_updateAvailableItems.bind(this);
@@ -121,16 +122,20 @@ export default class ToolbarComponent extends BaseComponent {
                 data-title="My Collection" data-icon="folder"></app-iconbutton><br>
             <app-badge data-count="0" data-emphasis="high"></app-badge>
             <app-badge data-count="0" data-emphasis="medium"></app-badge>
-            </li>
+            </li>  
             <li data-omnibox><app-omnibox></app-omnibox></li>
             <li>
             <app-iconbutton data-action="menu_open"
                 data-title="Other Operations..." data-icon="more_vert"></app-iconbutton><br>
             <app-menu data-width="250px" data-offset-x="-220px">
             <a slot="menuitem" href="#" data-action="webview_appBugsPage">Report a Bug</a>
+            <a slot="menuitem" href="#" data-action="check_for_updates">Check for Updates</a>
             <a slot="menuitem" href="#" data-action="general_about">About This App</a>
             </app-menu>
             </li>
+            <li>
+            <app-iconbutton data-action="login" data-title="Login" data-icon="account_circle" data-state="active"></app-iconbutton>
+            </li>
             </ul>
             </nav>
         `;
@@ -183,11 +188,21 @@ export default class ToolbarComponent extends BaseComponent {
                 this.contentRoot.querySelector('app-menu').close();
                 break;
             }
+            case 'check_for_updates':{
+                //this._ipcRenderer.send('checkForUpdates');
+                this.dispatch('ocsManager_checkForUpdates', {});
+                this.contentRoot.querySelector('app-menu').close();
+                break;
+            }
             case 'general_about': {
                 this.dispatch('general_about', {});
                 this.contentRoot.querySelector('app-menu').close();
                 break;
             }
+            case 'login':{
+                this.dispatch('webview_loginPage', {});
+                break;                
+            }
         }
     }
 

app/scripts/components/WebviewComponent.js

@@ -102,6 +102,11 @@ export default class WebviewComponent extends BaseComponent {
 
         this._webview.addEventListener('did-stop-loading', () => {
             this.dispatch('webview_loading', {isLoading: false});
+
+            // workaround for Input cursor invisible after navigation in webview
+            // details at https://github.com/electron/electron/issues/14474
+            this._webview.blur();
+            this._webview.focus();
         });
 
         this._webview.addEventListener('dom-ready', () => {

app/scripts/handlers/OcsManagerHandler.js

@@ -144,6 +144,12 @@ export default class OcsManagerHandler {
 
                 return false;
             })
+            .add('ocsManager_checkForUpdates', () => {
+                console.log('checkForUpdates');
+                this._ocsManagerApi.send('UpdateHandler::checkAppUpdate', []).then(function(res){
+                    console.log(res)
+                });
+            })
             .add('ocsManager_update', (data) => {
                 this._ocsManagerApi.send('UpdateHandler::update', [data.itemKey]);
                 return false;

app/scripts/handlers/WebviewHandler.js

@@ -73,6 +73,10 @@ export default class WebviewHandler {
             .add('webview_appBugsPage', () => {
                 this._webviewComponent.loadUrl(this._appPackage.bugs);
                 return false;
+            })
+            .add('webview_loginPage', () => {
+                this._webviewComponent.loadUrl('https://www.pling.com/login');
+                return false;
             });
     }
 

build/asset-manifest.json

+{
+  "main.css": "static/css/main.8055198b.css",
+  "main.css.map": "static/css/main.8055198b.css.map",
+  "main.js": "static/js/main.35a069ca.js",
+  "main.js.map": "static/js/main.35a069ca.js.map"
+}
\ No newline at end of file

build/index.html

+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="./favicon.ico"><link href="./static/css/main.8055198b.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="./static/js/main.35a069ca.js"></script></body></html>
\ No newline at end of file

build/static/css/main.8055198b.css

+.material-icons.md-12,.material-icons.md-smaller{font-size:12px}.material-icons.md-18,.material-icons.md-small{font-size:18px}.material-icons.md-24,.material-icons.md-medium{font-size:24px}.material-icons.md-36,.material-icons.md-large{font-size:36px}.material-icons.md-48,.material-icons.md-larger{font-size:48px}.material-icons.md-dark,.material-icons.md-dark.md-active{color:rgba(0,0,0,.54)}.material-icons.md-dark.md-inactive{color:rgba(0,0,0,.26)}.material-icons.md-light,.material-icons.md-light.md-active{color:#fff}.material-icons.md-light.md-inactive{color:hsla(0,0%,100%,.3)}div.background-overlay{z-index:999;height:100%}div.background-overlay,nav#menu-bar{position:absolute;top:0;left:0;width:100%}nav#menu-bar{height:40px;border-bottom:1px solid var(--color-border);background-color:var(--color-widget)}nav#menu-bar #main-menu{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-align:center;align-items:center;height:inherit;margin:0 4px}nav#menu-bar #main-menu>li{-ms-flex:0 0 auto;flex:0 0 auto;height:30px;margin:0 2px;width:30px}nav#menu-bar #main-menu>li>button{height:30px;width:30px}nav#menu-bar #main-menu>li>button i{height:24px;position:relative}nav#menu-bar #main-menu>li span.app-badge{display:inline-block;padding:3px 6px;border-radius:10px;font-size:11px;line-height:1;z-index:1;position:absolute;top:-5px;right:-12px;font-style:normal}nav#menu-bar #main-menu>li span.app-badge.low-emphasis{background-color:var(--color-active-secondary);color:var(--color-text)}nav#menu-bar #main-menu>li span.app-badge.medium-emphasis{background-color:var(--color-information);color:var(--color-content)}nav#menu-bar #main-menu>li span.app-badge.high-emphasis{background-color:var(--color-important);color:var(--color-content)}nav#menu-bar #main-menu>li#omnibox-menu{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex:1 1 auto;flex:1 1 auto;-ms-flex-pack:center;justify-content:center}nav#menu-bar #main-menu>li #user-menu-container button{padding-top:3px;height:30px}nav#menu-bar #main-menu>li ul#user-menu{z-index:1000;position:relative;top:0;left:-220px;width:250px;min-width:auto;max-width:auto;height:auto;min-height:auto;max-height:auto;padding:3px 0;border:1px solid var(--color-border);border-radius:5px;box-shadow:0 5px 20px 0 var(--color-shadow);background-color:var(--color-content)}nav#menu-bar #main-menu>li ul#user-menu li{width:100%;height:30px;margin:0}nav#menu-bar #main-menu>li ul#user-menu li a{display:block;padding:.5em 1em;background-color:transparent;color:var(--color-text);line-height:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;cursor:pointer}nav#menu-bar #main-menu>li ul#user-menu li a:hover{background-color:var(--color-active);color:var(--color-text)}@media (min-width:900px){nav#menu-bar ul li#omnibox-menu{margin-right:128px}}div#omnibox-container{max-width:500px;width:100%;height:30px}div#omnibox-container div#omnibox{position:relative;width:inherit;height:inherit}div#omnibox-container div#omnibox.active:after{background-color:var(--color-important)}div#omnibox-container div#omnibox.download-active:after{background:linear-gradient(90deg,transparent,var(--color-information) 50%,transparent);background-size:300% 300%;animation:gradient 2s ease-in-out infinite alternate;position:absolute;width:101%;height:36px;left:-2.5px}div#omnibox-container div#omnibox div#omnibox-wrapper{z-index:10;position:absolute;width:100%;height:100%;border-radius:3px;background-color:var(--color-widget);overflow:hidden}div#omnibox-container div#omnibox #progress-bar-container{width:100%;height:2px;position:absolute;bottom:0;left:0;z-index:11;overflow:hidden;border-radius:0 3px 3px 0}div#omnibox-container div#omnibox:after{display:block;content:"";z-index:9;position:absolute;top:-3px;width:106%;height:106%;border-radius:6px}div#omnibox-container div#omnibox-content{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-align:center;align-items:center;width:100%;height:100%;background-color:var(--color-active-secondary);line-height:1;transition:background-color .2s ease-out}div#omnibox-container div#omnibox-content #open-in-browser-container i .MuiSvgIcon-root{font-size:inherit}div#omnibox-container div#omnibox-content:hover{background-color:var(--color-active)}div#omnibox-container div#omnibox-content h3{-ms-flex:1 1 auto;flex:1 1 auto;border-right:1px solid var(--color-border);overflow:hidden;white-space:nowrap;text-overflow:ellipsis;line-height:24px;text-align:center;cursor:pointer}div#omnibox-container div#omnibox-content div{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:30px}div#omnibox-container div#omnibox-palette{z-index:1000;position:relative;top:0;left:0;width:inherit;padding:1em;border:1px solid var(--color-border);border-radius:5px;box-shadow:0 5px 20px 0 var(--color-shadow);background-color:var(--color-content)}div#omnibox-container div#omnibox-palette.inactive{display:none}div#omnibox-container div#omnibox-palette div.palette-content{padding:1em;border-bottom:1px solid var(--color-border)}div#omnibox-container div#omnibox-palette div.palette-content:last-child{border-bottom:0}div#omnibox-container div#omnibox-palette div.palette-content h4{margin:1em 0;text-align:center}div#omnibox-container div#omnibox-palette div.palette-content h4 i{position:relative;top:3px}div#omnibox-container div#omnibox-palette div.palette-content p{text-align:center}div#omnibox-container div#omnibox-palette div.palette-content nav ul{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-pack:center;justify-content:center}div#omnibox-container div#omnibox-palette div.palette-content nav ul li{width:50%;padding:5px}div#omnibox-container div#omnibox-palette div.palette-content nav ul li button{padding:5px;width:100%;border:1px solid #ccc;transition:all .2s ease-out}div#omnibox-container div#omnibox-palette div.palette-content nav ul li button:hover{background-color:#fff;border-color:#999}div#omnibox-container div#omnibox-palette div.palette-content nav ul li button.active{border-color:#4949f3}@keyframes gradient{0%{background-position:0 0}to{background-position:100% 0}}#collections-container{position:relative;padding-left:200px}#collections-container,#collections-container aside{display:-ms-flexbox;display:flex;-ms-flex-flow:column nowrap;flex-flow:column nowrap;-ms-flex:1 1 auto;flex:1 1 auto}#collections-container aside{border-right:1px solid var(--color-border);background-color:var(--color-widget);overflow:auto;position:absolute;left:0;top:0;width:200px;height:100%}#collections-container aside h4{padding:.5em 1em}#collections-container aside ul.task{border-bottom:1px solid var(--color-border)}#collections-container aside ul li a{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-align:center;align-items:center;width:100%;padding:.5em 1em;background-color:transparent;color:var(--color-text);cursor:pointer}#collections-container aside ul li a.selected{background-color:var(--color-active)}#collections-container aside ul li a span.name{-ms-flex:1 1 auto;flex:1 1 auto;display:inline-block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;line-height:1;text-transform:capitalize}#collections-container aside ul li a span.app-badge{-ms-flex:0 0 auto;flex:0 0 auto}#collections-container #collections-switch-view{display:-ms-flexbox;display:flex;-ms-flex-flow:column nowrap;flex-flow:column nowrap;-ms-flex:1 1 auto;flex:1 1 auto;overflow:auto}#collections-container #collections-switch-view ul{list-style:none}#collections-container #collections-switch-view ul li{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-align:center;align-items:center;margin:1em;padding:1em 2em;border:1px solid var(--color-border);border-radius:5px;transition:all .2s ease-out}#collections-container #collections-switch-view ul li:hover{border-color:rgba(0,0,0,.3)}#collections-container #collections-switch-view ul+ul li:first-of-type{margin-top:0}#collections-container #collections-switch-view figure{-ms-flex:0 0 auto;flex:0 0 auto;width:64px;height:64px;background-position:50%;background-repeat:no-repeat;background-size:contain}#collections-container #collections-switch-view figure i .MuiSvgIcon-root{font-size:inherit}#collections-container #collections-switch-view div.item-main{-ms-flex:1 1 auto;flex:1 1 auto;padding:0 1em}#collections-container #collections-switch-view nav.actions{-ms-flex:0 0 auto;flex:0 0 auto}#collections-container #collections-switch-view nav.actions button{-webkit-appearance:none;-moz-appearance:none;appearance:none;display:inline-block;width:inherit;height:inherit;padding:.5em 1em;border:1px solid var(--color-border);border-radius:3px;background-color:var(--color-content);outline:none;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#collections-container #collections-switch-view nav.actions button:enabled{cursor:pointer}#collections-container #collections-switch-view nav.actions button:enabled:hover{background-color:var(--color-active)}#collections-container #collections-switch-view nav.actions button:checked,#collections-container #collections-switch-view nav.actions button:checked:hover{background-color:var(--color-information-secondary)}#collections-container #collections-switch-view nav.actions button+button{margin-left:3px}#collections-container #collections-switch-view .progress-bar-container{display:inline-block;width:100%;margin:.5em 0}#collections-container #collections-switch-view .progress-bar-container progress{width:100%}div#dialog-overlay,div#dialog-overlay-background{display:-ms-flexbox;display:flex;-ms-flex-flow:column nowrap;flex-flow:column nowrap;z-index:1000;position:absolute;top:0;left:0;width:100%;height:100%;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}div#dialog-overlay.inactive{display:none}article.dialog{display:-ms-flexbox;display:flex;-ms-flex-flow:column nowrap;flex-flow:column nowrap;min-width:auto;max-width:auto;min-height:auto;max-height:auto;border:1px solid var(--color-border);border-radius:5px;box-shadow:0 0 20px 10px var(--color-shadow);background-color:var(--color-content);z-index:1001}article.dialog header{display:-ms-flexbox;display:flex;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-align:center;align-items:center;padding:5px 10px;border-bottom:1px solid var(--color-border);border-top-left-radius:5px;border-top-right-radius:5px}article.dialog header div.header-content{-ms-flex:1 1 auto;flex:1 1 auto}article.dialog header div.header-control{-ms-flex:0 0 auto;flex:0 0 auto}article.dialog header div.header-control button{height:30px;width:30px}article.dialog header div.header-control button i{height:24px}article.dialog header.inactive{display:none}article.dialog article.content,article.dialog article.content .inner-content{display:-ms-flexbox;display:flex;-ms-flex-flow:column nowrap;flex-flow:column nowrap;-ms-flex:1 1 auto;flex:1 1 auto}article.dialog article.content .inner-content{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;padding:1em}article.dialog article.content .inner-content h4,article.dialog article.content .inner-content p{margin:.5em 0;text-align:center;color:#444}article.dialog article.content figure{display:inline-block;width:128px;height:128px;background-position:50%;background-repeat:no-repeat;background-size:128px 128px;text-align:center}article.dialog article.content figure img{width:auto;height:100%;margin:0 auto}article.dialog article.content h3{margin:1em}article.dialog footer{-ms-flex:0 0 auto;flex:0 0 auto;padding:5px 10px;border-top:1px solid var(--color-border);border-bottom-left-radius:5px;border-bottom-right-radius:5px}article.dialog footer.inactive{display:none}article.dialog#loading-dialog{width:400px;height:300px}article.dialog#about-dialog{width:500px;height:auto}article.dialog#collections-dialog{width:80%;height:80%}#main{padding-top:40px;position:relative}#main,#main #webview-container,#main #webview-wrapper{width:100%;height:100%}#main #webview-container webview{height:100%}#main #webview-mask{background-color:#fff;position:absolute;width:100%;height:100%;top:40px;left:0}:host,:root{--color-text:#444;--color-text-secondary:#666;--color-content:#fff;--color-widget:#f5f5f5;--color-border:rgba(0,0,0,.15);--color-shadow:rgba(0,0,0,.2);--color-active:rgba(0,0,0,.1);--color-active-secondary:hsla(0,0%,39%,.1);--color-information:#4496d3;--color-information-secondary:#68a4d9;--color-help:var(--color-information);--color-help-secondary:var(--color-information-secondary);--color-important:#f3981d;--color-important-secondary:#ed6d35;--color-accept:#37a34a;--color-accept-secondary:#79c06e;--color-error:#ea5549;--color-error-secondary:#d83473;--color-warning:var(--color-error);--color-warning-secondary:var(--color-error-secondary)}:host{color:var(--color-text)}a{color:var(--color-information)}a:hover{color:var(--color-information-secondary)}.fade-in,.fade-out{animation:fade .2s}.fade-out{animation-direction:reverse;animation-fill-mode:forwards}@keyframes fade{0%{opacity:0}to{opacity:1}}app-root,body,html{width:100%;height:100%;overflow:hidden}*,:after,:before{box-sizing:inherit;font-family:inherit;font-size:inherit;line-height:inherit}:host,:root{box-sizing:border-box}:host{display:block}:host,body{font-family:Arial,sans-serif;font-size:13px;line-height:1.4;cursor:default}article,aside,canvas,details,embed,figcaption,figure,footer,header,main,nav,section,summary{display:block}datalist,keygen,mark,meter,progress,rp,rt,ruby,time,wbr{display:inline}address,article,aside,audio,blockquote,body,button,canvas,caption,dd,details,div,dl,dt,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hr,iframe,img,input,legend,li,main,nav,object,ol,p,pre,section,select,summary,table,tbody,td,textarea,tfoot,th,thead,tr,ul,video{margin:0;padding:0}nav ul{list-style:none}a{text-decoration:none;outline:none}#root{height:100%;width:100%}button{-webkit-appearance:none;-moz-appearance:none;appearance:none;display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:inherit;height:inherit;border:0;border-radius:3px;background-color:transparent;outline:none;transition:background-color .2s ease-out}button:enabled{cursor:pointer}button:enabled:hover{background-color:var(--color-active)}button:checked,button:checked:hover{background-color:var(--color-information-secondary)}span.app-badge{display:inline-block;padding:3px 6px;border-radius:10px;font-size:11px;line-height:1}span.app-badge.low-emphasis{background-color:var(--color-active-secondary);color:var(--color-text)}span.app-badge.medium-emphasis{background-color:var(--color-information);color:var(--color-content)}span.app-badge.high-emphasis{background-color:var(--color-important);color:var(--color-content)}
+/*# sourceMappingURL=main.8055198b.css.map*/
\ No newline at end of file

build/static/css/main.8055198b.css.map

+{"version":3,"sources":[],"names":[],"mappings":"","file":"static/css/main.8055198b.css","sourceRoot":""}
\ No newline at end of file

desktop/ocs-store.desktop

-[Desktop Entry]
-Name=OCS-Store
-Exec=ocs-store
-Icon=ocs-store
-Type=Application
-Terminal=false
-NoDisplay=false
-Categories=Network;Settings;

package.json

 {
   "name": "pling-store",
   "productName": "Pling-Store",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Store Frontend and Management Application based on OpenCollaborationServices (OCS) of Opendesktop.org.",
   "author": "Pling.com",
   "license": "GPL-3.0",
-  "homepage": "https://www.pling.com/",
-  "repository": "https://www.opencode.net/dfn2/pling-store",
+  "homepage": "./",
+  "repoHomepage": "https://www.pling.com/",
+  "repository": "https://www.opencode.net/dfn2/pling-store-development",
   "bugs": "https://www.opencode.net/dfn2/pling-store/issues",
-  "main": "app/main.js",
+  "main": "src/electron-starter.js",
   "scripts": {
-    "start": "electron .",
+    "start": "react-scripts build && electron .",
     "debug": "electron . --debug",
     "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)($|/)'",
-    "watch": "webpack --mode development --watch"
+    "watch": "webpack --mode development --watch",
+    "react-start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject",
+    "electron": "electron .",
+    "dev": "nf start -p 3000"
   },
   "dependencies": {
     "electron-store": "2.*.*",
@@ -21,10 +28,16 @@
     "esm": "3.*.*",
     "lit-html": "1.*.*",
     "request": "2.*.*",
-    "update-electron-app": "^1.5.0"
+    "@material-ui/core": "^4.3.3",
+    "@material-ui/icons": "^4.2.1",
+    "react": "^16.1.1",
+    "react-dom": "^16.1.1",
+    "react-electron-web-view": "^2.0.1"
   },
   "devDependencies": {
     "electron": "4.*.*",
-    "electron-packager": "13.*.*"
+    "electron-packager": "13.*.*",
+    "foreman": "^2.0.0",
+    "react-scripts": "0.8.5"
   }
 }

pkg/appimage/appimagebuild

 #!/bin/bash
 
 PKGNAME='pling-store'
-PKGVER='5.0.1'
+PKGVER='5.0.2'
 
 # Only timestamp development branches
-if [ "${CI_COMMIT_REF_SLUG}" != "master" ]; then
+if [[ "${CI_PROJECT_NAME}" == *"development"* ]]; then
   PKGREL=dev-${CI_COMMIT_SHORT_SHA}-$(date +"%Y%m%d-%H%M%S")
 else
   PKGREL='1'
@@ -19,6 +19,9 @@ APPDIR="${PKGNAME}.AppDir"
 make
 make DESTDIR=${APPDIR} prefix=/usr install
 
+# Set version
+echo "X-AppImage-Version=${PKGVER}" >> ${APPDIR}/usr/share/applications/${PKGNAME}.desktop
+
 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
@@ -28,7 +31,7 @@ install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/ocs-st
 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
 
-curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/d3dc42436b82d11360ebc96b38d4aaf4/ocs-manager-0.8.1-1-x86_64.AppImage
+curl -fsSL -o ocs-manager https://www.opencode.net/dfn2/ocs-manager/-/jobs/artifacts/master/raw/build_ocs-manager/ocs-manager-0.8.1-1-x86_64.AppImage?job=appimage
 install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager
 
 IMWHEEL_PATH=$(which imwheel)
@@ -42,6 +45,7 @@ chmod 755 appimagetool
 
 # Fix url in zsync file
 sed -i "/^URL:.*$/c\URL: ${APPIMAGE_FILE_NAME}?job=appimage" *-x86_64.AppImage.zsync
+sed -i "/^Filename:.*$/c\Filename: ${APPIMAGE_FILE_NAME}" *-x86_64.AppImage.zsync
 
 mv *-x86_64.AppImage ../${APPIMAGE_FILE_NAME}
 mv *-x86_64.AppImage.zsync ../${ZSYNC_FILE_NAME}