diff options
| author | zxp19821005 | 2024-11-18 16:10:18 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-11-18 16:10:18 +0800 |
| commit | 4f8ab35e073fb067d0bb8a18b8b033fd67a4bad5 (patch) | |
| tree | d6cd490843d325be8d0177b1f01e23ccca5c5b35 | |
| parent | 048e289bea5548f2b9f01d53b7a44b8b046c7764 (diff) | |
| download | aur-4f8ab35e073fb067d0bb8a18b8b033fd67a4bad5.tar.gz | |
update to fix errors
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rwxr-xr-x | PKGBUILD | 21 | ||||
| -rw-r--r-- | windterm.sh | 6 |
3 files changed, 17 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = windterm-bin - pkgdesc = A Quicker and better SSH/Telnet/Serial/Shell/Sftp client for DevOps. + pkgdesc = A Quicker and better SSH/Telnet/Serial/Shell/Sftp client for DevOps.(Prebuilt version) pkgver = 2.6.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/kingToolbox/WindTerm/ arch = x86_64 license = Apache-2.0 @@ -18,6 +18,6 @@ pkgbase = windterm-bin source = windterm-bin-2.6.1.tar.gz::https://github.com/kingToolbox/WindTerm//releases/download/2.6.0/WindTerm_2.6.1_Linux_Portable_x86_64.tar.gz source = windterm.sh sha256sums = 2704ec7d49044a5daf531e3c4da9ca6003955b0eaae31198fa2d0facdf467e90 - sha256sums = 612bb2919e8389fe46f4d8cae00d6c18ec4a3b2cfc065c12266273205b75c112 + sha256sums = 6ae1477e3b2024bebd32731fbe0cb299ca86388afea45367b2ffb2a9eb57a9d1 pkgname = windterm-bin @@ -3,8 +3,8 @@ pkgname=windterm-bin _pkgname=WindTerm pkgver=2.6.1 -pkgrel=2 -pkgdesc='A Quicker and better SSH/Telnet/Serial/Shell/Sftp client for DevOps.' +pkgrel=3 +pkgdesc="A Quicker and better SSH/Telnet/Serial/Shell/Sftp client for DevOps.(Prebuilt version)" arch=('x86_64') license=('Apache-2.0') url='https://github.com/kingToolbox/WindTerm/' @@ -27,12 +27,14 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('2704ec7d49044a5daf531e3c4da9ca6003955b0eaae31198fa2d0facdf467e90' - '612bb2919e8389fe46f4d8cae00d6c18ec4a3b2cfc065c12266273205b75c112') + '6ae1477e3b2024bebd32731fbe0cb299ca86388afea45367b2ffb2a9eb57a9d1') build() { - sed -e "s|@appname@|${pkgname%-bin}|g" \ - -e "s|@runname@|${_pkgname}|g" \ - -i "${srcdir}/${pkgname%-bin}.sh" - sed "s|/usr/bin/${pkgname%-bin}|${pkgname%-bin} %U|g" -i "${srcdir}/${_pkgname}_${pkgver}/${pkgname%-bin}.desktop" + sed -e " + s/@appname@/${pkgname%-bin}/g + s/@runname@/${_pkgname}/g + " -i "${srcdir}/${pkgname%-bin}.sh" + sed "s/\/usr\/bin\/${pkgname%-bin}/${pkgname%-bin} %U/g" -i "${srcdir}/${_pkgname}_${pkgver}/${pkgname%-bin}.desktop" + find "${srcdir}/${_pkgname}_${pkgver}/terminal" -type d \( -name macos -o -name windows -o -name cmd -o -name powershell -o -name wsl \) -exec rm -rf {} + find "${srcdir}/${_pkgname}_${pkgver}/" -type d -exec chmod 755 {} \; find "${srcdir}/${_pkgname}_${pkgver}/global" -type f -exec chmod 644 {} \; find "${srcdir}/${_pkgname}_${pkgver}/lib" -type f -exec chmod 644 {} \; @@ -48,9 +50,8 @@ build() { } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" - install -Dm755 -d "${pkgdir}/opt/${pkgname%-bin}" - cp -r "${srcdir}/${_pkgname}_${pkgver}/"* "${pkgdir}/opt/${pkgname%-bin}" + install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}" + cp -Pr --no-preserve=ownership "${srcdir}/${_pkgname}_${pkgver}/"* "${pkgdir}/usr/lib/${pkgname%-bin}" install -Dm644 "${srcdir}/${_pkgname}_${pkgver}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications" install -Dm644 "${srcdir}/${_pkgname}_${pkgver}/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps" - chown -R "${USER}":"${USER}" "${pkgdir}/opt/${pkgname%-bin}" }
\ No newline at end of file diff --git a/windterm.sh b/windterm.sh index 82ddb198a5fc..7bd14d1529bb 100644 --- a/windterm.sh +++ b/windterm.sh @@ -1,11 +1,11 @@ #!/bin/bash -set -e -_APPDIR="/opt/@appname@" +set -o pipefail +_APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" export _PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/lib:${LD_LIBRARY_PATH}" export XDG_RUNTIME_DIR="${_APPDIR}/lib:${XDG_RUNTIME_DIR}" export QT_PLUGIN_PATH="${_APPDIR}/lib:${QT_PLUGIN_PATH}" export RUNLEVEL=3 -cd "${_APPDIR}" +cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; } exec "${_RUNNAME}" "$@" || exit $?
\ No newline at end of file |