diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | simple-web-server.sh | 21 |
3 files changed, 41 insertions, 29 deletions
@@ -1,19 +1,18 @@ pkgbase = simple-web-server pkgdesc = Create a local web server in just a few clicks with an easy to use interface. A continuation of Web Server for Chrome, built with Electron. - pkgver = 1.2.10 - pkgrel = 3 + pkgver = 1.2.11 + pkgrel = 1 url = https://simplewebserver.org/ arch = any license = MIT makedepends = npm makedepends = nodejs makedepends = gendesk - makedepends = git makedepends = curl depends = electron28 - source = simple-web-server.git::git+https://github.com/terreng/simple-web-server#tag=v1.2.10 + source = simple-web-server-1.2.11.tar.gz::https://github.com/terreng/simple-web-server/archive/refs/tags/v1.2.11.tar.gz source = simple-web-server.sh - sha256sums = 5f87b463444b0192f1299d296ca11a4a10e539267c4b7cc7a8c45455c3345a6b - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 9dedb08dccf0c2d62fb563bd3961097abd94a3e2e5b11d536909a32ddcec10d0 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = simple-web-server @@ -1,9 +1,9 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=simple-web-server _pkgname="Simple Web Server" -pkgver=1.2.10 +pkgver=1.2.11 _electronversion=28 -pkgrel=3 +pkgrel=1 pkgdesc="Create a local web server in just a few clicks with an easy to use interface. A continuation of Web Server for Chrome, built with Electron." arch=('any') url="https://simplewebserver.org/" @@ -17,46 +17,46 @@ makedepends=( 'npm' 'nodejs' 'gendesk' - 'git' 'curl' ) source=( - "${pkgname}.git::git+${_ghurl}#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.sh" ) -sha256sums=('5f87b463444b0192f1299d296ca11a4a10e539267c4b7cc7a8c45455c3345a6b' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('9dedb08dccf0c2d62fb563bd3961097abd94a3e2e5b11d536909a32ddcec10d0' + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ -e "s|@runname@|app.asar|g" \ -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" - gendesk -f -n -q --categories="Development" --name="${_pkgname}" --exec="${pkgname%-bin} %U" - cd "${srcdir}/${pkgname}.git" + gendesk -f -n -q --pkgname="${pkgname}" --pkgdesc="${pkgdesc}" --categories="Development" --name="${_pkgname}" --exec="${pkgname%-bin} %U" + cd "${srcdir}/${pkgname}-${pkgver}" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" - export npm_config_target="${SYSTEM_ELECTRON_VERSION}" - export ELECTRONVERSION="${_electronversion}" - export npm_config_disturl=https://electronjs.org/headers + #export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" + #export npm_config_target="${SYSTEM_ELECTRON_VERSION}" + #export ELECTRONVERSION="${_electronversion}" HOME="${srcdir}/.electron-gyp" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then - echo 'registry="https://registry.npmmirror.com/"' >> .npmrc - echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc - echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc + export npm_config_registry=https://registry.npmmirror.com + export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/ + export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/ + export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/ else echo "Your network is OK." fi HOME="${srcdir}/.electron-gyp" npm install - npx electron-builder --linux --dir + npx electron-builder -l --dir } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}.git/images/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-bin}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/images/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" }
\ No newline at end of file diff --git a/simple-web-server.sh b/simple-web-server.sh index 7ddcaab8d734..4cfe3ac09dd8 100644 --- a/simple-web-server.sh +++ b/simple-web-server.sh @@ -1,16 +1,29 @@ #!/bin/bash -set -e +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}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |