diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | simplest-file-renamer.sh | 25 |
3 files changed, 27 insertions, 13 deletions
@@ -1,13 +1,12 @@ pkgbase = simplest-file-renamer-bin pkgdesc = Rename your files directly or with your favorite text editor, making use of all your 1337 keyboard shortcuts pkgver = 1.0.0 - pkgrel = 5 + pkgrel = 6 url = https://github.com/whyboris/Simplest-File-Renamer arch = x86_64 license = MIT makedepends = fuse2 - depends = hicolor-icon-theme - depends = electron8-bin + depends = electron8 provides = simplest-file-renamer conflicts = simplest-file-renamer source = simplest-file-renamer-1.0.0.AppImage::https://github.com/whyboris/Simplest-File-Renamer/releases/download/v1.0.0/Simplest.File.Renamer-1.0.0.AppImage @@ -15,6 +14,6 @@ pkgbase = simplest-file-renamer-bin source = simplest-file-renamer.sh sha256sums = ee8d258a22da54055a6fb851884664ecbe4ca01234e6e81faf61eb9b2ba3c044 sha256sums = 52debcb7a9763131668b36c7a61730979cb67975b8b4004a12c62915221e836f - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = simplest-file-renamer-bin @@ -4,7 +4,7 @@ pkgname=simplest-file-renamer-bin _pkgname=Simplest.File.Renamer pkgver=1.0.0 _electronversion=8 -pkgrel=5 +pkgrel=6 pkgdesc="Rename your files directly or with your favorite text editor, making use of all your 1337 keyboard shortcuts" arch=('x86_64') url='https://github.com/whyboris/Simplest-File-Renamer' @@ -12,8 +12,7 @@ license=('MIT') conflicts=("${pkgname%-bin}") provides=("${pkgname%-bin}") depends=( - 'hicolor-icon-theme' - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'fuse2' @@ -25,11 +24,12 @@ source=( ) sha256sums=('ee8d258a22da54055a6fb851884664ecbe4ca01234e6e81faf61eb9b2ba3c044' '52debcb7a9763131668b36c7a61730979cb67975b8b4004a12c62915221e836f' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') 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" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" diff --git a/simplest-file-renamer.sh b/simplest-file-renamer.sh index f9ced1432cfc..398398461fee 100644 --- a/simplest-file-renamer.sh +++ b/simplest-file-renamer.sh @@ -1,14 +1,29 @@ -#!/bin/sh -set -e +#!/bin/bash +set -o pipefail _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_CFGDIR="@cfgdirname@/" +_OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 +export ELECTRON_FORCE_IS_PACKAGED=true +export ELECTRON_DISABLE_SECURITY_WARNINGS=true +export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS +if [[ -f "${_FLAGS_FILE}" ]]; then + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" +fi cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |