diff --git a/README.md b/README.md index 21ea65b..3bccd0b 100644 --- a/README.md +++ b/README.md @@ -151,9 +151,11 @@ This is the minimal desktop test based on `ubuntu` `16.04`, `18.04` or `20.04` i ## Update records -### ver 1.6 @ 6/22/2021 +### ver 1.6.1 @ 7/6/2021 + +1. Fix a bug caused by the upgrade of noVNC. -The plan for the next version. +### ver 1.6 @ 6/22/2021 1. Support the proxy value for the built image, this value is important for the devices protected by the firewall. 2. Move [GitKraken][link-gitkraken] to the optional packages. Instead, the default Git client is switched to [GitFiend][link-gitfiend]. diff --git a/scripts/install-vnc b/scripts/install-vnc index 2a9cf68..8c73466 100644 --- a/scripts/install-vnc +++ b/scripts/install-vnc @@ -103,7 +103,7 @@ then rm -f tigervncserver_install.deb || fail fi - SOURCE_PATH="/apps/source/" + SOURCE_PATH="/apps/source" BUILD_PATH="/usr/local/bin" mkdir -p $SOURCE_PATH || fail @@ -111,12 +111,22 @@ then msg "Install noVNC." cd $SOURCE_PATH || fail git clone https://github.com/novnc/noVNC.git || fail - ln -s $SOURCE_PATH/noVNC/utils/launch.sh $BUILD_PATH/noVNC || fail + + if [ -f "$SOURCE_PATH/noVNC/utils/novnc_proxy" ]; then + ln -s $SOURCE_PATH/noVNC/utils/novnc_proxy $BUILD_PATH/noVNC || fail + else + if [ -f "$SOURCE_PATH/noVNC/utils/launch.sh" ]; then + ln -s $SOURCE_PATH/noVNC/utils/launch.sh $BUILD_PATH/noVNC || fail + else + msgerr "Fail to find the launching script in the current noVNC build, maybe the repository has a wrong version." + exit 1 + fi + fi # Install websockify cd $SOURCE_PATH/noVNC/utils || fail git clone https://github.com/novnc/websockify websockify || fail - + # This operation is needed when python<=3.5 CUR_PY_VER=$(python3 /root/scripts/get-pyver.py 2>&1) if [ "x${CUR_PY_VER}" != "xpy36" ] && [ "x${CUR_PY_VER}" != "xpy37+" ]