diff --git a/PKGBUILD b/PKGBUILD index 6116899..b007d98 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=tms-bbt pkgver=1.0 -pkgrel=3 +pkgrel=4 pkgdesc="SmartTMS application suite for managing cinema devices." arch=('x86_64') url="https://your.company.com/smarttms" @@ -14,7 +14,7 @@ depends=('python' 'sudo' 'xdg-utils' 'tms-mysql' 'tms-oracle-jdk8') source=("${pkgname}.tar.gz") -sha256sums=('ab1ad2932c29f14b0f3cf614a58a925557095007d90bb2f8f51a6a094b429e27') +sha256sums=('ef7848c834b52a3f4c1151769f73a4ef1b838c742ef2644361f4536c81ad9571') install="${pkgname}.install" diff --git a/tms-bbt.tar.gz b/tms-bbt.tar.gz index 61493f9..9df1e3e 100644 Binary files a/tms-bbt.tar.gz and b/tms-bbt.tar.gz differ diff --git a/tms-bbt/apache-tomcat-7.0.63/webapps/noVNC-master/utils/launch.sh b/tms-bbt/apache-tomcat-7.0.63/webapps/noVNC-master/utils/launch.sh index 2ef0ac2..87a7cde 100755 --- a/tms-bbt/apache-tomcat-7.0.63/webapps/noVNC-master/utils/launch.sh +++ b/tms-bbt/apache-tomcat-7.0.63/webapps/noVNC-master/utils/launch.sh @@ -103,33 +103,17 @@ else fi # try to find websockify (prefer local, try global, then download local) -if [[ -e ${HERE}/websockify ]]; then - WEBSOCKIFY=${HERE}/websockify/run +WEBSOCKIFY=$(which websockify 2>/dev/null) - if [[ ! -x $WEBSOCKIFY ]]; then - echo "The path ${HERE}/websockify exists, but $WEBSOCKIFY either does not exist or is not executable." - echo "If you inteded to use an installed websockify package, please remove ${HERE}/websockify." - exit 1 - fi +if [[ $? -ne 0 ]]; then + # 如果系统PATH中找不到 websockify,则尝试克隆 + echo "No installed websockify, attempting to clone websockify..." + WEBSOCKIFY=${HERE}/websockify/run # 设定克隆后 websockify/run 的路径 echo "Using local websockify at $WEBSOCKIFY" else - WEBSOCKIFY=$(which websockify 2>/dev/null) - - if [[ $? -ne 0 ]]; then - echo "No installed websockify, attempting to clone websockify..." - WEBSOCKIFY=${HERE}/websockify/run - git clone https://github.com/kanaka/websockify ${HERE}/websockify - - if [[ ! -e $WEBSOCKIFY ]]; then - echo "Unable to locate ${HERE}/websockify/run after downloading" - exit 1 - fi - - echo "Using local websockify at $WEBSOCKIFY" - else - echo "Using installed websockify at $WEBSOCKIFY" - fi + # 如果系统PATH中找到了 websockify + echo "Using installed websockify at $WEBSOCKIFY" fi echo "Starting webserver and WebSockets proxy on port ${PORT}"