update to v0.6.2 & fixes bwrap

5 files changed, 37 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaddf543e63a..ed37ead5b056 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = phira-bin
 	pkgdesc = A clone of the music game Phigros that supports custom beatmaps, multiplayer etc.
-	pkgver = 0.4.0
-	pkgrel = 3
+	pkgver = 0.6.2
+	pkgrel = 1
 	url = https://github.com/TeamFlos/phira
 	arch = x86_64
 	license = GPL3
@@ -9,13 +9,13 @@ pkgbase = phira-bin
 	makedepends = git
 	depends = gcc-libs
 	depends = bubblewrap
-	source = phira-v0.4.0.zip::https://github.com/TeamFlos/phira/releases/download/v0.4.0/Phira-linux-v0.4.0.zip
+	depends = snapd-xdg-open-git
+	provides = phira
+	source = phira-v0.6.2.zip::https://github.com/TeamFlos/phira/releases/download/v0.6.2/Phira-linux-v0.6.2.zip
 	source = run.sh
 	source = phira.desktop
-	source = phira.png
-	b2sums = f70c1a067784ce7c74287a3621d5885fbcfa5edc26b60efd2985b40fc9674ef88259eea64a16e4fd090e7552cf48ef13f6ae46f37ad34b096af3836ade174c5b
-	b2sums = 7fc927449a92b07235c54fe05491c8cefd967649720f5ef2260dd58b3ae50893d72dd5c152f740b746969dd3991d2db7139b7e40e42077783664e0b02dc3bcbd
-	b2sums = e370a20c1c049f99d80852c25e396e28e7595e040fd2f565ccb05e4a8f56e5ec60f3b2be6a3dee5094768418a86ebd7bcfcf5870ae40094bde11c744c4df2c32
-	b2sums = f88a9b0a83856cfe861f3b69673757464c234c9244db1619ec4fcff8d9d05c7482b5555af7f593ab16267556f8eef138699e4abe548d72ed35172e545819dc2d
+	b2sums = d7c67dfb9dfb2827809049b7775d31a84ad27b63759acbb93a18aed9d251292c41a16dc96a03d7e2240e04c9534707a0f4fe9b84b6cac609dd95067177ad978b
+	b2sums = 6082233569818cb02d92893f0afcdfe6d43ba77adc061b3abb52132b2260d5fd51adf8b91a147e8e83d61573c1ac87fdcadd3a75aaf1193ee102b3b17d6f9466
+	b2sums = 6be953d4402faf3dda9bd2cfb8bff31b1cb1bfce81bad2f3f0d1af034f3b0a33e0a88026f5cb030ae737b90e3fc3c72da3938d153e3e930beefaf2910b356224
 
 pkgname = phira-bin
diff --git a/PKGBUILD b/PKGBUILD
index 0659ce3834cc..c5045b792a61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Ujhhgtg <feyxiexzf@gmail.com>
 
 pkgname=phira-bin
-pkgver=0.4.0
-pkgrel=3
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="A clone of the music game Phigros that supports custom beatmaps, multiplayer etc."
 arch=('x86_64')
 url="https://github.com/TeamFlos/phira"
@@ -10,7 +10,9 @@ license=('GPL3')
 depends=(
     'gcc-libs'
     'bubblewrap'
+    'snapd-xdg-open-git'
 )
+provides=("phira")
 
 # The reason this package depends on bubblewrap:
 # Since Phira currently reads & writes its config from the dir containing itself,
@@ -25,14 +27,10 @@ source=(
     "${pkgname%-bin}-v$pkgver.zip::https://github.com/TeamFlos/${pkgname%-bin}/releases/download/v$pkgver/Phira-linux-v$pkgver.zip"
     "run.sh"
     "${pkgname%-bin}.desktop"
-    "${pkgname%-bin}.png"
-)
-b2sums=(
-    'f70c1a067784ce7c74287a3621d5885fbcfa5edc26b60efd2985b40fc9674ef88259eea64a16e4fd090e7552cf48ef13f6ae46f37ad34b096af3836ade174c5b'
-    '7fc927449a92b07235c54fe05491c8cefd967649720f5ef2260dd58b3ae50893d72dd5c152f740b746969dd3991d2db7139b7e40e42077783664e0b02dc3bcbd'
-    'e370a20c1c049f99d80852c25e396e28e7595e040fd2f565ccb05e4a8f56e5ec60f3b2be6a3dee5094768418a86ebd7bcfcf5870ae40094bde11c744c4df2c32'
-    'f88a9b0a83856cfe861f3b69673757464c234c9244db1619ec4fcff8d9d05c7482b5555af7f593ab16267556f8eef138699e4abe548d72ed35172e545819dc2d'
 )
+b2sums=('d7c67dfb9dfb2827809049b7775d31a84ad27b63759acbb93a18aed9d251292c41a16dc96a03d7e2240e04c9534707a0f4fe9b84b6cac609dd95067177ad978b'
+        '6082233569818cb02d92893f0afcdfe6d43ba77adc061b3abb52132b2260d5fd51adf8b91a147e8e83d61573c1ac87fdcadd3a75aaf1193ee102b3b17d6f9466'
+        '6be953d4402faf3dda9bd2cfb8bff31b1cb1bfce81bad2f3f0d1af034f3b0a33e0a88026f5cb030ae737b90e3fc3c72da3938d153e3e930beefaf2910b356224')
 
 package() {
     # game
@@ -48,6 +46,6 @@ package() {
     install -Dm644 "${pkgname%-bin}.desktop" "$pkgdir/usr/share/applications/${pkgname%-bin}.desktop"
 
     # icon
-    mkdir -p "$pkgdir/usr/share/icons/hicolor/512x512/apps/"
-    install -Dm644 "${pkgname%-bin}.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/${pkgname%-bin}.png"
+    mkdir -p "$pkgdir/usr/share/icons/hicolor/128x128/apps/"
+    install -Dm644 "assets/icon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/${pkgname%-bin}.png"
 }
diff --git a/phira.desktop b/phira.desktop
index 7a44bbfa1e55..dd004f49804c 100644
--- a/phira.desktop
+++ b/phira.desktop
@@ -5,6 +5,6 @@ Version=0.4.0
 Exec=/usr/bin/phira
 Type=Application
 Terminal=false
-Icon=/usr/share/icons/hicolor/512x512/apps/phira.png
+Icon=/usr/share/icons/hicolor/128x128/apps/phira.png
 Comment=A clone of the music game Phigros that supports custom beatmaps, multiplayer etc.
 Categories=Gaming;Music;Rust;
diff --git a/phira.png b/phira.png
deleted file mode 100644
index 6cbf641d5ae2..000000000000
--- a/phira.png
+++ /dev/null
diff --git a/run.sh b/run.sh
index e79da018a143..a908bdaacf7f 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,20 @@
 #!/usr/bin/bash
-mkdir -p ~/.config/phira/data/ ~/.config/phira/cache/
-bwrap --bind / / --tmpfs /usr/share/phira/ --ro-bind /usr/share/phira/phira-main /usr/share/phira/phira-main --ro-bind /usr/share/phira/assets/ /usr/share/phira/assets/ --bind ~/.config/phira/data/ /usr/share/phira/data/ --bind ~/.config/phira/cache/ /usr/share/phira/cache/ /usr/share/phira/phira-main
\ No newline at end of file
+if [ ! -d ~/.config/phira/cache/ ]; then mkdir -p ~/.config/phira/cache/ ; fi
+if [ ! -d ~/.config/phira/data/ ]; then mkdir -p ~/.config/phira/data/ ; fi
+bwrap \
+    --bind / / \
+    --ro-bind /run/user/$UID/bus /run/user/$UID/bus \
+    --ro-bind /usr/lib/snapd-xdg-open/xdg-open /usr/bin/xdg-open \
+    --ro-bind /sys /sys \
+    --tmpfs /tmp \
+    --proc /proc \
+    --dev /dev \
+    --tmpfs /usr/share/phira/ \
+    --bind /usr/share/phira/phira-main /usr/share/phira/phira-main \
+    --bind /usr/share/phira/assets/ /usr/share/phira/assets/ \
+    --bind ~/.config/phira/data/ /usr/share/phira/data/ \
+    --bind ~/.config/phira/cache/ /usr/share/phira/cache/ \
+    --unshare-all \
+    --share-net \
+    --new-session \
+    /usr/share/phira/phira-main