summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052025-04-11 17:24:14 +0800
committerzxp198210052025-04-11 17:24:14 +0800
commit494267286234bbcce2c7680dd4a65b6e5ce3982b (patch)
treecd203d394380b288b3ec62eecd905e6b889a20e1
parenteb1a580dd8b883cc221417f5aa87ff40f806ff7b (diff)
downloadaur-picturama-bin.tar.gz
update to fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD33
-rw-r--r--picturama.sh2
3 files changed, 21 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c68adcd5e0b..c77e04b0608d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = picturama-bin
- pkgdesc = Digital image organizer powered by the web
+ pkgdesc = Digital image organizer powered by the web.(Prebuilt version.Use system-wide electron)
pkgver = 1.3.0
- pkgrel = 4
+ pkgrel = 5
url = https://picturama.github.io/
arch = x86_64
license = MIT
@@ -14,6 +14,6 @@ pkgbase = picturama-bin
source = picturama.sh
sha256sums = a40fc27395841cf3220ed7db3ba98717d3b3a24fc1733b81759218fbd28c3e3a
sha256sums = b8ff1b44d19d011a234dc2490176e17231321a397f742088679c6c96555aba25
- sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+ sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
pkgname = picturama-bin
diff --git a/PKGBUILD b/PKGBUILD
index 6ba1e8fc2192..aec9349fa837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@ pkgname=picturama-bin
_pkgname=Picturama
pkgver=1.3.0
_electronversion=9
-pkgrel=4
-pkgdesc="Digital image organizer powered by the web"
-arch=("x86_64")
+pkgrel=5
+pkgdesc="Digital image organizer powered by the web.(Prebuilt version.Use system-wide electron)"
+arch=('x86_64')
url="https://picturama.github.io/"
_ghurl="https://github.com/picturama/picturama"
-license=("MIT")
+license=('MIT')
provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
@@ -24,22 +24,23 @@ source=(
)
sha256sums=('a40fc27395841cf3220ed7db3ba98717d3b3a24fc1733b81759218fbd28c3e3a'
'b8ff1b44d19d011a234dc2490176e17231321a397f742088679c6c96555aba25'
- '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
-build() {
- sed -e "s|@electronversion@|${_electronversion}|g" \
- -e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@runname@|app.asar|g" \
- -e "s|@cfgdirname@|${_pkgname}|g" \
- -e "s|@options@||g" \
- -i "${srcdir}/${pkgname%-bin}.sh"
- chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
+ '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
+prepare() {
+ sed -i -e "
+ s/@electronversion@/${_electronversion}/g
+ s/@appname@/${pkgname%-bin}/g
+ s/@runname@/app.asar/g
+ s/@cfgdirname@/${_pkgname}/g
+ s/@options@//g
+ " "${srcdir}/${pkgname%-bin}.sh"
+ chmod +x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
"${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
- sed "s|AppRun|${pkgname%-bin} %U|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+ sed -i "s/AppRun/${pkgname%-bin} %U/g" "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
asar e "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/app.asar.unpacked"
- cp -r "${srcdir}/app.asar.unpacked/node_modules/sqlite3/lib/binding/electron-v9.0-linux-x64" \
+ cp -Pr --no-preserve=ownership "${srcdir}/app.asar.unpacked/node_modules/sqlite3/lib/binding/electron-v9.0-linux-x64" \
"${srcdir}/app.asar.unpacked/node_modules/sqlite3/lib/binding/electron-v9.4-linux-x64"
rm -rf "${srcdir}/app.asar.unpacked/node_modules/sqlite3/lib/binding/electron-v9.0-linux-x64"
- sed "s|process.resourcesPath|\"\/usr\/lib\/${pkgname%-bin}\"|g" -i "${srcdir}/app.asar.unpacked/dist/"{app.js,background.js}
+ find "${srcdir}/app.asar.unpacked/dist" -type f -exec sed -i "s/process.resourcesPath/\"\/usr\/lib\/${pkgname%-bin}\"/g" {} +
asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
}
package() {
diff --git a/picturama.sh b/picturama.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/picturama.sh
+++ b/picturama.sh
@@ -21,7 +21,7 @@ if [[ -f "${_FLAGS_FILE}" ]]; then
fi
done < "${_FLAGS_FILE}"
fi
-cd "${_APPDIR}"
+cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; }
if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
else