diff options
author | zxp19821005 | 2024-05-14 18:04:31 +0800 |
---|---|---|
committer | zxp19821005 | 2024-05-14 18:04:31 +0800 |
commit | 06f07277a2ed4df463c052241a15427975eae9b1 (patch) | |
tree | 4edd9774e166ffa7b52807b5f71cf08925521cc5 | |
parent | 139d1c0d1408c9ec0ba97fdaea5dca254009632e (diff) | |
download | aur-super-controller.tar.gz |
fix errors
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | super-controller.sh | 21 |
3 files changed, 54 insertions, 32 deletions
@@ -1,21 +1,23 @@ pkgbase = super-controller pkgdesc = Give your MIDI devices super powers: take control of the lights, messages, and communication between controllers. pkgver = 1.3.5 - pkgrel = 6 + pkgrel = 7 url = https://github.com/aolsenjazz/super-controller arch = any license = MIT makedepends = gendesk makedepends = npm makedepends = nvm - makedepends = git + makedepends = curl makedepends = gcc makedepends = base-devel - depends = electron19-bin + depends = electron19 conflicts = super-controller - source = super-controller.git::git+https://github.com/aolsenjazz/super-controller.git#tag=v1.3.5 + options = !strip + options = !emptydirs + source = super-controller-1.3.5.tar.gz::https://github.com/aolsenjazz/super-controller/archive/refs/tags/v1.3.5.tar.gz source = super-controller.sh - sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 73ea7ef6c4c96b8d15c7bde4185a4cfcb4f4e3b33138b0a6df90ef73c0a91276 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = super-controller @@ -1,31 +1,36 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=super-controller +_pkgname=SuperController pkgver=1.3.5 _electronversion=19 -_nodeversion=14 -pkgrel=6 +_nodeversion=18 +pkgrel=7 pkgdesc="Give your MIDI devices super powers: take control of the lights, messages, and communication between controllers." arch=('any') url="https://github.com/aolsenjazz/super-controller" license=('MIT') conflicts=("${pkgname}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" ) makedepends=( 'gendesk' 'npm' 'nvm' - 'git' + 'curl' 'gcc' 'base-devel' ) +options=( + '!strip' + '!emptydirs' +) source=( - "${pkgname}.git::git+${url}.git#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.sh" ) -sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') +sha256sums=('73ea7ef6c4c96b8d15c7bde4185a4cfcb4f4e3b33138b0a6df90ef73c0a91276' + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -36,37 +41,39 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="Development" --name="${pkgname}" --exec="${pkgname} %U" - cd "${srcdir}/${pkgname}.git" + gendesk -q -f -n --pkgname="${pkgname}" --categories="Development" --name="${_pkgname}" --exec="${pkgname} %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 ifconfig.co/country` = "China" ];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 + if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then + 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 - sed "s|--publish never|--dir|g" -i package.json + sed "s|AppImage|dir|g" -i package.json npm run post-clone npm run package } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}.git/release/build/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - cp -r "${srcdir}/${pkgname}.git/release/build/linux-"*/resources/{app.asar.unpacked,assets} "${pkgdir}/usr/lib/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/release/build/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + cp -r "${srcdir}/${pkgname}-${pkgver}/release/build/linux-"*/resources/{app.asar.unpacked,assets} "${pkgdir}/usr/lib/${pkgname}" for _icons in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do - install -Dm644 "${srcdir}/${pkgname}.git/assets/icons/${_icons}.png" \ + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/assets/icons/${_icons}.png" \ "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png" done install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}.git/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/super-controller.sh b/super-controller.sh index 7ddcaab8d734..398398461fee 100644 --- a/super-controller.sh +++ b/super-controller.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 |