Commit 3b9a3ab3 authored by azubieta's avatar azubieta

Merge branch 'development' into 'master'

Development

See merge request dfn2/pling-store!17
parents a10f5008 3f1d851a
Pipeline #973 passed with stage
in 14 minutes and 22 seconds
......@@ -8,5 +8,5 @@ appimage:
- ./scripts/package appimage
artifacts:
paths:
- build_*/pling-store*.AppImage
- build_*/pling-store*.AppImage*
expire_in: 2 days
......@@ -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,6 +93,7 @@ function createWindow() {
mainWindow.loadURL(indexFileUrl);
mainWindow.maximize();
mainWindow.on('close', () => {
const appConfigStore = new ElectronStore({name: appConfigStoreStorage});
appConfigStore.set('windowBounds', mainWindow.getBounds());
......
......@@ -121,7 +121,7 @@ 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"
......
This diff is collapsed.
......@@ -13,24 +13,17 @@
"start": "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"
},
"dependencies": {
"electron-store": "2.*.*",
"request": "2.*.*",
"electron-updater": "^4.1.2",
"esm": "3.*.*",
"lit-html": "1.*.*"
"lit-html": "1.*.*",
"request": "2.*.*"
},
"devDependencies": {
"electron": "4.*.*",
"electron-packager": "13.*.*",
"@babel/core":"*",
"@babel/polyfill":"*",
"@babel/preset-env": "*",
"@babel/preset-react": "*",
"react":"*",
"react-dom":"*",
"webpack":"*",
"webpack-cli":"*"
"electron-packager": "13.*.*"
}
}
......@@ -2,9 +2,18 @@
PKGNAME='pling-store'
PKGVER='5.0.1'
PKGREL='1'
UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/ocs-store-x86_64.AppImage.zsync'
# Only timestamp development branches
if [ "${CI_COMMIT_REF_SLUG}" != "master" ]; then
PKGREL=dev-${CI_COMMIT_SHORT_SHA}-$(date +"%Y%m%d-%H%M%S")
else
PKGREL='1'
fi
APPIMAGE_FILE_NAME=${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage
ZSYNC_FILE_NAME=${PKGNAME}-${CI_COMMIT_REF_SLUG}-x86_64.AppImage.zsync
UPDINFO="zsync|https://www.opencode.net/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/jobs/artifacts/${CI_COMMIT_REF_SLUG}/raw/build_pling-store/${ZSYNC_FILE_NAME}?job=appimage"
APPDIR="${PKGNAME}.AppDir"
make
......@@ -19,7 +28,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)
......@@ -31,9 +40,8 @@ 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
# Fix url in zsync file
sed -i "/^URL:.*$/c\URL: ${APPIMAGE_FILE_NAME}?job=appimage" *-x86_64.AppImage.zsync
mv *-x86_64.AppImage ../${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage
mv *-x86_64.AppImage ../${APPIMAGE_FILE_NAME}
mv *-x86_64.AppImage.zsync ../${ZSYNC_FILE_NAME}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment