diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 68 | ||||
| -rw-r--r-- | hawkpass.sh | 2 |
3 files changed, 45 insertions, 30 deletions
@@ -1,5 +1,5 @@ pkgbase = hawkpass-git - pkgdesc = Secure diceware passphrase generator + pkgdesc = Secure diceware passphrase generator.Use system-wide electron. pkgver = 1.2.0.r19.g632adad pkgrel = 1 url = https://kalpetros.github.io/hawkpass @@ -9,6 +9,7 @@ pkgbase = hawkpass-git makedepends = git makedepends = gendesk makedepends = curl + makedepends = nvm depends = electron22 depends = nodejs provides = hawkpass=1.2.0 @@ -18,6 +19,6 @@ pkgbase = hawkpass-git source = hawkpass.git::git+https://github.com/kalpetros/hawkpass.git source = hawkpass.sh sha256sums = SKIP - sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 + sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980 pkgname = hawkpass-git @@ -3,8 +3,9 @@ pkgname=hawkpass-git _pkgname=Hawkpass pkgver=1.2.0.r19.g632adad _electronversion=22 +_nodeversion=18 pkgrel=1 -pkgdesc="Secure diceware passphrase generator" +pkgdesc="Secure diceware passphrase generator.Use system-wide electron." arch=('any') url="https://kalpetros.github.io/hawkpass" _ghurl="https://github.com/kalpetros/hawkpass" @@ -20,54 +21,67 @@ makedepends=( 'git' 'gendesk' 'curl' + 'nvm' ) options=( '!strip' '!emptydirs' - #'!staticlibs' ) source=( "${pkgname//-/.}::git+${_ghurl}.git" - "${pkgname%-git}.sh") + "${pkgname%-git}.sh" +) sha256sums=('SKIP' - '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') + '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980') pkgver() { cd "${srcdir}/${pkgname//-/.}" - git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' + set -o pipefail + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)" +} +_ensure_local_nvm() { + local NVM_DIR="${srcdir}/.nvm" + source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] + nvm install "${_nodeversion}" + nvm use "${_nodeversion}" } build() { - sed -e "s|@electronversion@|${_electronversion}|" \ - -e "s|@appname@|${pkgname%-git}|g" \ - -e "s|@runname@|app|g" \ - -e "s|@cfgdirname@|${pkgname%-git}|g" \ - -e "s|@options@||g" \ - -i "${srcdir}/${pkgname%-git}.sh" + sed -e " + s/@electronversion@/${_electronversion}/g + s/@appname@/${pkgname%-git}/g + s/@runname@/app.asar/g + s/@cfgdirname@/${pkgname%-git}/g + s/@options@//g + " -i "${srcdir}/${pkgname%-git}.sh" gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname//-/.}" - 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 SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" HOME="${srcdir}/.electron-gyp" - 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." + { + echo -e '\n' + #echo 'build_from_source=true' + echo "cache=${srcdir}/.npm_cache" + } >> .npmrc + if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then + { + echo 'registry=https://registry.npmmirror.com' + echo 'disturl=https://registry.npmmirror.com/-/binary/node/' + echo 'electron_mirror=https://registry.npmmirror.com/-/binary/electron/' + echo 'electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/' + } >> .npmrc + sed -i "s/registry.npmjs.org/registry.npmmirror.com/g" package-lock.json fi - NODE_ENV=development npm install - NODE_ENV=production npm run build - NODE_ENV=production npm run package + sed -i "s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/g" package.json + NODE_ENV=development npm install + NODE_ENV=production npm run build + NODE_ENV=production npm run package rm -rf out/"${pkgname%-git}"-linux-*/resources/app/.cache } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-git}" - cp -r "${srcdir}/${pkgname//-/.}/out/${pkgname%-git}-linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname%-git}" + cp -Pr --no-preserve=ownership "${srcdir}/${pkgname//-/.}/out/${pkgname%-git}-linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname%-git}" install -Dm644 "${srcdir}/${pkgname//-/.}/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png" install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications" install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/hawkpass.sh b/hawkpass.sh index 4cfe3ac09dd8..40e422ca2ee7 100644 --- a/hawkpass.sh +++ b/hawkpass.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 |