Skip to content

Commit

Permalink
Added missing peggy support, changed coloring of filter reset icon, c…
Browse files Browse the repository at this point in the history
…hanged architecture section in snapcraft.yaml
  • Loading branch information
ransome1 committed Jan 7, 2025
1 parent e8fb598 commit 502da95
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"main": ".webpack/main",
"scripts": {
"start": "electron-forge start",
"package": "electron-forge package",
"make": "electron-forge make",
"package": "yarn peggy && electron-forge package",
"make": "yarn peggy && electron-forge make",
"peggy": "peggy --format es --output ./src/main/modules/Filters/FilterLang.js ./src/main/modules/Filters/FilterLang.pegjs",
"mas": "PLATFORM=mas DEBUG=electron-osx-sign* electron-forge make --arch=universal --platform=mas",
"lint": "eslint --ext .ts,.tsx ."
Expand Down
21 changes: 12 additions & 9 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ confinement: strict
icon: ./assets/icons/512x512.png
license: MIT
compression: lzo
architectures:
- build-on: [amd64]
run-on: [amd64]
- build-on: [arm64]
run-on: [arm64]
platforms:
amd64:
build-on: [amd64]
build-for: [amd64]
arm64:
build-on: [arm64]
build-for: [arm64]
apps:
sleek:
command: snap/command-chain/desktop-launch $SNAP/sleek/sleek --disable-gpu --no-sandbox
Expand All @@ -27,7 +29,7 @@ apps:
PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform
GTK_USE_PORTAL: '1'
extensions: [gnome]
extensions: [gnome-46-2404]
plugs:
- desktop
- home
Expand All @@ -40,7 +42,7 @@ parts:
build-environment:
- PATH: "$PATH:$SNAPCRAFT_PART_BUILD/node_modules/.bin"
build-snaps:
- node/18/stable
- node/23/stable
source: .
override-build: |
if [ -n "$http_proxy" ]; then
Expand All @@ -50,6 +52,7 @@ parts:
fi
node.yarn
node.yarn peggy
node.yarn make
mv $SNAPCRAFT_PART_BUILD/out/sleek-* \
Expand All @@ -59,15 +62,15 @@ parts:
cleanup:
after: [ sleek ]
plugin: nil
build-snaps: [ gnome ]
build-snaps: [ gnome-46-2404 ]
override-prime: |
cd sleek
ls -l
rm LICENSES.chromium.html
rm chrome-sandbox
ls -l
set -eux
for snap in "gnome"; do # List all content-snaps you're using here
for snap in "gnome-46-2404"; do # List all content-snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
done
for CRUFT in bug lintian man; do
Expand Down

0 comments on commit 502da95

Please sign in to comment.