update shellscripts

author: zxp19821005 2024-10-24 07:04:44 +0800
committer: zxp19821005 2024-10-24 07:04:44 +0800
commit: 837c4882c168b81e76757e0003312cf28fa277e5 (patch)
tree: 0b2b37b5fdb669e428d77c27c77cb85bdd701f63
parent: b5a962a2a7f1bb83f83d297ac34ca91631fde571 (diff)
download: aur-837c4882c168b81e76757e0003312cf28fa277e5.tar.gz
3 files changed, 40 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4f6a9ed3cf5a..58fdaa427913 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = stage-retriever
-	pkgdesc = Share multiple screens at once to any meeting app.
+	pkgdesc = Share multiple screens at once to any meeting app.Use system-wide electron.
 	pkgver = 0.0.2
 	pkgrel = 3
 	url = https://github.com/gabrielesilinic/stage-retriever
@@ -12,9 +12,9 @@ pkgbase = stage-retriever
 	makedepends = git
 	depends = electron28
 	conflicts = stage-retriever
-	source = stage-retriever.git::git+https://github.com/gabrielesilinic/stage-retriever.git#tag=v0.0.2
+	source = stage-retriever-0.0.2.tar.gz::https://github.com/gabrielesilinic/stage-retriever/archive/refs/tags/v0.0.2.tar.gz
 	source = stage-retriever.sh
-	sha256sums = 426b1781d4511faa8ed9a307e97f940774bdf8b5e6d97fef28e9c74f2d0bd473
-	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+	sha256sums = b40d796f11ff720dba7a824754fc6871ff5ad7bb454dd96ce6c6bf3d1b1b6d5c
+	sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
 
 pkgname = stage-retriever
diff --git a/PKGBUILD b/PKGBUILD
index a6bdbdffcfde..25d915407257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=0.0.2
 _electronversion=28
 _nodeversion=18
 pkgrel=3
-pkgdesc="Share multiple screens at once to any meeting app."
+pkgdesc="Share multiple screens at once to any meeting app.Use system-wide electron."
 arch=('any')
 url="https://github.com/gabrielesilinic/stage-retriever"
 license=('Apache-2.0')
@@ -21,49 +21,55 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
     "${pkgname}.sh"
 )
-sha256sums=('426b1781d4511faa8ed9a307e97f940774bdf8b5e6d97fef28e9c74f2d0bd473'
-            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
+sha256sums=('b40d796f11ff720dba7a824754fc6871ff5ad7bb454dd96ce6c6bf3d1b1b6d5c'
+            '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
 _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}|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}.sh"
+    sed -e "
+        s/@electronversion@/${_electronversion}/g
+        s/@appname@/${pkgname}/g
+        s/@runname@/app.asar/g
+        s/@cfgdirname@/${pkgname}/g
+        s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g
+    " -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
     gendesk -q -f -n --pkgname="${pkgname}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname} %U"
-    cd "${srcdir}/${pkgname}.git"
-    export npm_config_build_from_source=true
-    export npm_config_cache="${srcdir}/.npm_cache"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    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."
+    {
+        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
+        find ./ -type f -name "package-lock.json" -exec sed -i "s/registry.npmjs.org/registry.npmmirror.com/g" {} +
     fi
-    NODE_ENV=development npm install
-    NODE_ENV=production npm run build:unpack
+    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 exec -c "electron-builder --linux dir -c.electronDist=${electronDist}"
 }
 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}-${pkgver}/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}.git/resources/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}/resources/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 \ No newline at end of file
diff --git a/stage-retriever.sh b/stage-retriever.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/stage-retriever.sh
+++ b/stage-retriever.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
author	zxp19821005	2024-10-24 07:04:44 +0800
committer	zxp19821005	2024-10-24 07:04:44 +0800
commit	837c4882c168b81e76757e0003312cf28fa277e5 (patch)
tree	0b2b37b5fdb669e428d77c27c77cb85bdd701f63
parent	b5a962a2a7f1bb83f83d297ac34ca91631fde571 (diff)
download	aur-837c4882c168b81e76757e0003312cf28fa277e5.tar.gz