update to 1.83.108

author: zxp19821005 2024-10-09 10:18:04 +0800
committer: zxp19821005 2024-10-09 10:18:04 +0800
commit: a8871608e9ae8a320ef039183e20c30d91dc7e32 (patch)
tree: 3df0fc9931b8d46c2c5a6719950d400503cab0a0
parent: 7ee1275c4d2ea418bff643680c9ae4c9299d9b27 (diff)
download: aur-a8871608e9ae8a320ef039183e20c30d91dc7e32.tar.gz
3 files changed, 41 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c8964e96705a..29cf575a4a16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chatall
 	pkgdesc = Concurrently chat with ChatGPT, Bing Chat, Bard, Alpaca, Vicuna, Claude, ChatGLM, MOSS, 讯飞星火, 文心一言 and more, discover the best answers
-	pkgver = 1.82.107
+	pkgver = 1.83.108
 	pkgrel = 1
 	url = http://chatall.ai/
 	arch = any
@@ -10,12 +10,13 @@ pkgbase = chatall
 	makedepends = npm
 	makedepends = python
 	makedepends = curl
+	makedepends = yarn
 	depends = electron31
 	provides = chatall
 	conflicts = chatall
-	source = chatall.git::git+https://github.com/sunner/ChatALL.git#tag=v1.82.107
+	source = chatall-1.83.108.tar.gz::https://github.com/sunner/ChatALL/archive/refs/tags/v1.83.108.tar.gz
 	source = chatall.sh
-	sha256sums = 466e35de0dfc8fe382011777a67d2a19782c77be643ed35f8b35cfd8ed2a4c37
-	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+	sha256sums = bdb4385bf0a8e4b5ce1d39320e3fd4fe7a6fc80e278038e7be5d369e7a2063d7
+	sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
 
 pkgname = chatall
diff --git a/PKGBUILD b/PKGBUILD
index ddb3c4d84505..ba46808fdba3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 _pkgname=ChatALL
 pkgname=chatall
-pkgver=1.82.107
+pkgver=1.83.108
 _electronversion=31
-_nodeversion=20
+_nodeversion=18
 pkgrel=1
 pkgdesc="Concurrently chat with ChatGPT, Bing Chat, Bard, Alpaca, Vicuna, Claude, ChatGLM, MOSS, 讯飞星火, 文心一言 and more, discover the best answers"
 arch=('any')
@@ -21,52 +21,55 @@ makedepends=(
     'npm'
     'python'
     'curl'
+    'yarn'
 )
 source=(
-    "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}"
+    "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/v${pkgver}.tar.gz"
     "${pkgname}.sh"
 )
-sha256sums=('466e35de0dfc8fe382011777a67d2a19782c77be643ed35f8b35cfd8ed2a4c37'
-            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
+sha256sums=('bdb4385bf0a8e4b5ce1d39320e3fd4fe7a6fc80e278038e7be5d369e7a2063d7'
+            '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%-bin}/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 -f -n -q --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}"
     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."
-    fi
-    sed "s|-wml --x64 --arm64|-l --dir|g" -i package.json
-    NODE_ENV=development npm install
-    NODE_ENV=production npm run release
+    {
+        echo -e '\n'	
+        #echo 'build_from_source=true'
+        echo "cache=${srcdir}/.npm_cache"
+        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/'
+        fi
+    } >> .npmrc
+    install -dm755 .git
+    sed -i "s/\"AppImage\", \"deb\"/\"dir\"/g" vue.config.js 
+    sed -i "s/--x64 --arm64//g;s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/g" package.json
+    NODE_ENV=development    npm install
+    NODE_ENV=production     npm run release-linux
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}.git/dist_electron/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/dist_electron/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}.git/src/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png"
-    install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 \ No newline at end of file
diff --git a/chatall.sh b/chatall.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/chatall.sh
+++ b/chatall.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-09 10:18:04 +0800
committer	zxp19821005	2024-10-09 10:18:04 +0800
commit	a8871608e9ae8a320ef039183e20c30d91dc7e32 (patch)
tree	3df0fc9931b8d46c2c5a6719950d400503cab0a0
parent	7ee1275c4d2ea418bff643680c9ae4c9299d9b27 (diff)
download	aur-a8871608e9ae8a320ef039183e20c30d91dc7e32.tar.gz