summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD35
-rw-r--r--flawesome.sh2
3 files changed, 23 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d24ef15a4723..9eaf0a4b1321 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = flawesome-bin
- pkgdesc = A modern productivity tool that will help you organise your day-today work and thoughts.
+ pkgdesc = A modern productivity tool that will help you organise your day-today work and thoughts.(Prebuilt version.Use system-wide electron)
pkgver = 0.2.3
- pkgrel = 16
+ pkgrel = 17
url = https://github.com/ashishBharadwaj/flawesome
arch = x86_64
license = GPL-3.0-only
@@ -11,6 +11,6 @@ pkgbase = flawesome-bin
source = flawesome-0.2.3.deb::https://github.com/ashishBharadwaj/flawesome/releases/download/v0.2.3/flawesome_0.2.3_amd64.deb
source = flawesome.sh
sha256sums = 1cb04d7b3bb6c57b269c4214b46d7619b6480697b7ac73acd209448711ea4252
- sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+ sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
pkgname = flawesome-bin
diff --git a/PKGBUILD b/PKGBUILD
index 71eb3a3b5896..7d1bec268c79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ pkgname=flawesome-bin
_pkgname=Flawesome
pkgver=0.2.3
_electronversion=9
-pkgrel=16
-pkgdesc="A modern productivity tool that will help you organise your day-today work and thoughts."
-arch=("x86_64")
+pkgrel=17
+pkgdesc="A modern productivity tool that will help you organise your day-today work and thoughts.(Prebuilt version.Use system-wide electron)"
+arch=('x86_64')
url="https://github.com/ashishBharadwaj/flawesome"
license=('GPL-3.0-only')
provides=("${pkgname%-bin}=${pkgver}")
@@ -18,24 +18,27 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('1cb04d7b3bb6c57b269c4214b46d7619b6480697b7ac73acd209448711ea4252'
- '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
-build() {
- sed -e "s|@electronversion@|${_electronversion}|g" \
- -e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@runname@|app.asar|g" \
- -e "s|@cfgdirname@|${pkgname%-bin}|g" \
- -e "s|@options@||g" \
- -i "${srcdir}/${pkgname%-bin}.sh"
- bsdtar -xf "${srcdir}/data."*
- sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g;s|Productivity|Utility|g" \
- -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+ '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
+prepare() {
+ sed -i -e "
+ s/@electronversion@/${_electronversion}/g
+ s/@appname@/${pkgname%-bin}/g
+ s/@runname@/app.asar/g
+ s/@cfgdirname@/${pkgname%-bin}/g
+ s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g
+ " "${srcdir}/${pkgname%-bin}.sh"
+ sed -i -e "
+ s/\/opt\/${_pkgname}\/${pkgname%-bin}/${pkgname%-bin}/g
+ s/Productivity/Utility/g
+ " "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
- cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+ cp -Pr --no-preserve=ownership "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
install -Dm644 "${srcdir}/opt/${_pkgname}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
- for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512;do
+ _icon_sizes=(16x16 32x32 48x48 64x64 128x128 256x256 512x512)
+ for _icons in "${_icon_sizes[@]}";do
install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
-t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
done
diff --git a/flawesome.sh b/flawesome.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/flawesome.sh
+++ b/flawesome.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