diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | aero-browser.sh | 22 |
3 files changed, 45 insertions, 22 deletions
@@ -1,7 +1,7 @@ pkgbase = aero-browser pkgdesc = A fast and lightweight web browser made with electron and react that allows you to navigate the Internet with ease. pkgver = 0.2.2_alpha - pkgrel = 3 + pkgrel = 5 url = https://aero-mymeiy532-frostbreker.vercel.app/ arch = any license = MIT @@ -12,9 +12,9 @@ pkgbase = aero-browser depends = electron23 provides = aero-browser conflicts = aero-browser - source = aero-browser.git::git+https://github.com/FrostBreker/Aero.git#tag=v0.2.2-alpha + source = aero-browser-0.2.2_alpha.tar.gz::https://github.com/FrostBreker/Aero/archive/refs/tags/v0.2.2-alpha.tar.gz source = aero-browser.sh - sha256sums = SKIP - sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe + sha256sums = 77b1cd25139304d506ed5477d2b224dc9352b157d32debb14bd5ad9773760388 + sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = aero-browser @@ -5,7 +5,7 @@ _pkgname="AeroBrowser" pkgver=0.2.2_alpha _electronversion=23 _nodeversion=18 -pkgrel=3 +pkgrel=5 pkgdesc="A fast and lightweight web browser made with electron and react that allows you to navigate the Internet with ease." arch=('any') url="https://aero-mymeiy532-frostbreker.vercel.app/" @@ -23,11 +23,11 @@ makedepends=( 'nvm' ) source=( - "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver//_/-}" + "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/v${pkgver//_/-}.tar.gz" "${pkgname}.sh" ) -sha256sums=('SKIP' - '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') +sha256sums=('77b1cd25139304d506ed5477d2b224dc9352b157d32debb14bd5ad9773760388' + '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -38,27 +38,36 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app|g" \ + -e "s|@cfgdirname@|${_appname}|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories="Network" --pkgname="${_appname}-browser" --name="${_pkgname}" --exec="${pkgname} %U" - cd "${srcdir}/${pkgname}.git" + gendesk -q -f -n --categories="Network" --pkgname="${pkgname}" --pkgdesc="${pkgdesc}" --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" - sed '53,56d;52s|,||g' -i electron-builder.json + 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|-l -c|-l --dir -c|g" -i package.json sed "s|https://www.google.fr/|about:blank|g" -i src/App.js npm install npm run electron:package:linux } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}.git/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png" + install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}.git/LICENSE.MD" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/LICENSE.MD" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/aero-browser.sh b/aero-browser.sh index 86cb3dc6a9bf..4cfe3ac09dd8 100644 --- a/aero-browser.sh +++ b/aero-browser.sh @@ -1,15 +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}" "$@" || 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 |