Merge branch 'development' of www.opencode.net:dfn2/pling-store into development

app/main.js

@@ -107,8 +107,7 @@ function isFile(path) {
     try {
         const stats = fs.statSync(path);
         return stats.isFile();
-    }
-    catch (error) {
+    } catch (error) {
         console.error(error);
         return false;
     }
@@ -118,8 +117,7 @@ function isDirectory(path) {
     try {
         const stats = fs.statSync(path);
         return stats.isDirectory();
-    }
-    catch (error) {
+    } catch (error) {
         console.error(error);
         return false;
     }
@@ -159,8 +157,7 @@ function removePreviewpic(itemKey) {
 app.on('ready', async () => {
     if (await startOcsManager()) {
         createWindow();
-    }
-    else {
+    } else {
         app.quit();
     }
 });
@@ -192,6 +189,9 @@ app.on('web-contents-created', (event, webContents) => {
     }
 });
 
+// Set configs dir
+app.setPath("userData", app.getPath("appData") + "/OCS-Store")
+
 ipcMain.on('app', (event, key) => {
     const data = {
         package: appPackage,
@@ -220,19 +220,15 @@ ipcMain.on('store', (event, key, value) => {
 ipcMain.on('previewpic', (event, kind, itemKey, url) => {
     if (kind === 'directory') {
         event.returnValue = previewpicDirectory;
-    }
-    else if (kind === 'path' && itemKey) {
+    } else if (kind === 'path' && itemKey) {
         event.returnValue = `${previewpicDirectory}/${previewpicFilename(itemKey)}`;
-    }
-    else if (kind === 'download' && itemKey && url) {
+    } else if (kind === 'download' && itemKey && url) {
         downloadPreviewpic(itemKey, url);
         event.returnValue = undefined;
-    }
-    else if (kind === 'remove' && itemKey) {
+    } else if (kind === 'remove' && itemKey) {
         removePreviewpic(itemKey);
         event.returnValue = undefined;
-    }
-    else {
+    } else {
         event.returnValue = false;
     }
 });

pkg/appimage/appimagebuild

@@ -22,7 +22,7 @@ install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/
 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
 
-IMWHEEL_PATH=`which imwheel`
+IMWHEEL_PATH=$(which imwheel)
 install -D -m 755 ${IMWHEEL_PATH} ${APPDIR}/usr/bin/ocs-imwheel
 install -D -m 644 imwheel.conf ${APPDIR}/usr/share/imwheel/.imwheelrc
 
@@ -31,4 +31,9 @@ chmod 755 appimagetool
 ./appimagetool --appimage-extract
 ./squashfs-root/AppRun -u "${UPDINFO}" ${APPDIR}
 
+# Only timestamp development branches
+if [ "${CI_COMMIT_REF_SLUG}" != "master" ]; then
+  PKGREL=dev-${CI_COMMIT_SHORT_SHA}-$(date +"%Y-%m-%d_%H-%M-%S")
+fi
+
 mv *-x86_64.AppImage ../${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage