diff options
| author | zxp19821005 | 2024-10-18 18:08:24 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-10-18 18:08:24 +0800 |
| commit | f2bc9752c115ce98ef0656e27c43bbd5f3e53111 (patch) | |
| tree | a944de32f0a84f428e0d7be78d4503b8625dc0a2 | |
| parent | 703dbdc3c817c5e8a9fbd7d24b40aee89681ed25 (diff) | |
| download | aur-f2bc9752c115ce98ef0656e27c43bbd5f3e53111.tar.gz | |
update to 0.7.2.r95.gb9f2d4f
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 69 | ||||
| -rw-r--r-- | webcam-glass.sh | 2 |
3 files changed, 44 insertions, 35 deletions
@@ -1,11 +1,11 @@ pkgbase = webcam-glass-git - pkgdesc = Cross-platform tool for making video tutorials and video conferencing, blending the webcam over the screen. - pkgver = 0.7.2.r94.gac705a1 + pkgdesc = Cross-platform tool for making video tutorials and video conferencing, blending the webcam over the screen.Use system-wide electron. + pkgver = 0.7.2.r95.gb9f2d4f pkgrel = 1 url = https://github.com/jersonlatorre/webcam-glass-app arch = x86_64 license = GPL-3.0-only - makedepends = npm + makedepends = bun makedepends = git makedepends = nvm makedepends = gendesk @@ -15,6 +15,6 @@ pkgbase = webcam-glass-git source = webcam-glass.git::git+https://github.com/jersonlatorre/webcam-glass-app.git source = webcam-glass.sh sha256sums = SKIP - sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 + sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980 pkgname = webcam-glass-git @@ -1,11 +1,11 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> -pkgname="webcam-glass-git" +pkgname=webcam-glass-git _pkgname="Webcam Glass" -pkgver=0.7.2.r94.gac705a1 +pkgver=0.7.2.r95.gb9f2d4f _electronversion=22 _nodeversion=18 pkgrel=1 -pkgdesc="Cross-platform tool for making video tutorials and video conferencing, blending the webcam over the screen." +pkgdesc="Cross-platform tool for making video tutorials and video conferencing, blending the webcam over the screen.Use system-wide electron." arch=('x86_64') url="https://github.com/jersonlatorre/webcam-glass-app" license=('GPL-3.0-only') @@ -15,59 +15,68 @@ depends=( "electron${_electronversion}" ) makedepends=( - 'npm' + 'bun' 'git' 'nvm' 'gendesk' ) source=( "${pkgname%-git}.git::git+${url}.git" - "${pkgname%-git}.sh") + "${pkgname%-git}.sh" +) sha256sums=('SKIP' - '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') + '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980') pkgver() { cd "${srcdir}/${pkgname%-git}.git" - git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//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() { - export NVM_DIR="${srcdir}/.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.asar|g" \ - -e "s|@cfgdirname@|${_pkgname}|g" \ - -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|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}/g + s/@options@//g + " -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.git" - export npm_config_build_from_source=true - export npm_config_cache="${srcdir}/.npm_cache" + electronDist="/usr/lib/electron${_electronversion}" 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." + if [ -f bunfig.toml ]; then + rm -rf bunfig.toml + fi + if [ -f bun.lockb ];then + rm -rf bun.lockb + fi + if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then + 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/" + export sqlite3_binary_site="https://registry.npmmirror.com/-/sqlite3/" + { + echo '[install]' + echo 'registry = "https://registry.npmmirror.com"' + } >> bunfig.toml fi rm -rf dist node_modules - sed "/AppImage/d;s|deb|dir|g" -i package.json - npm install - npm run buildLinux + sed -i "s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/g;s/dist\/linux/dist/g" package.json + bun install + bun exec "electron-builder --linux dir -c.electronDist=${electronDist}" } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" - install -Dm644 "${srcdir}/${pkgname%-git}.git/dist/linux/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}" + install -Dm644 "${srcdir}/${pkgname%-git}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}" install -Dm644 "${srcdir}/${pkgname%-git}.git/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png" install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications" install -Dm644 "${srcdir}/${pkgname%-git}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/webcam-glass.sh b/webcam-glass.sh index 4cfe3ac09dd8..40e422ca2ee7 100644 --- a/webcam-glass.sh +++ b/webcam-glass.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 |