Skip to content

Commit f3225ee

Browse files
committed
make sure to kill zoom right before starting a new one.
1 parent 4bc779a commit f3225ee

2 files changed

Lines changed: 20 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif()
3636
project(qutselect)
3737
set(PROJECT_LONGNAME "qutselect")
3838
set(PROJECT_VERSION_MAJOR 3)
39-
set(PROJECT_VERSION_MINOR 14)
39+
set(PROJECT_VERSION_MINOR 15)
4040
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
4141

4242
# change output directory to top-level 'bin' dir.

scripts/qutselect_connect_app.sh

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,30 @@ if [[ "${app}" == "zoom" ]]; then
9292
else
9393
osd_splash "Starting zoom..."
9494

95+
# make sure to kill any old zoom
96+
pkill zoom
97+
9598
# remove all previous data
9699
rm -rf "${HOME}/.zoom" "${HOME}/.config/zoom.conf" "${HOME}/.config/zoomus.conf"
97100

101+
# try to avoid that zoom stays open upon closing the window
102+
{
103+
echo "[General]"
104+
echo "forceEnableTrayIcon=false"
105+
echo "showSystemTitlebar=true"
106+
echo "sso_domain=hzdr-de.zoom.us"
107+
echo "useSystemTheme=true"
108+
echo "timeFormat12HoursEnable=false"
109+
echo "bForceMaximizeWM=true"
110+
} >"${HOME}/.config/zoomus.conf"
111+
98112
# add manual proxy settings in case HTTP_PROXY is set
99113
if [[ -n "${HTTP_PROXY}" ]] || [[ -n "${HTTPS_PROXY}" ]]; then
100114
http_host=$(echo "${HTTP_PROXY}" | cut -d/ -f3 | cut -d: -f1)
101115
http_port=$(echo "${HTTP_PROXY}" | cut -d: -f3)
102116
https_host=$(echo "${HTTPS_PROXY}" | cut -d/ -f3 | cut -d: -f1)
103117
https_port=$(echo "${HTTPS_PROXY}" | cut -d: -f3)
104118
{
105-
echo "[General]"
106119
echo "cefhttpProxyHost=${http_host}"
107120
echo "cefhttpProxyPort=${http_port}"
108121
echo "cefhttpsProxyHost=${https_host}"
@@ -113,12 +126,13 @@ if [[ "${app}" == "zoom" ]]; then
113126
echo "httpsProxyHost=${https_host}"
114127
echo "httpsProxyPort=${https_port}"
115128
echo "proxyType=manual"
116-
} >"${HOME}/.config/zoomus.conf"
129+
} >>"${HOME}/.config/zoomus.conf"
117130
fi
118131

119132
USER="Enter your name here" /opt/zoom/ZoomLauncher >"/tmp/zoom-${USER}-$$.log" 2>&1 &
120133
res=$?
121134

135+
sleep 4
122136
osd_close
123137
fi
124138

@@ -211,10 +225,13 @@ elif [[ "${app}" == "chrome" ]] || [[ "${app}" == "bbb" ]]; then
211225
) </dev/null >/dev/null 2>&1 &
212226

213227
# parent should return immediately
228+
sleep 4
214229
exit 0
215230
else
216231
/opt/chrome/chrome ${CMDOPT} --test-type --noerrdialogs --no-first-run --disable-translate --disk-cache-dir=/dev/null --disable-extensions >"/tmp/chrome-${USER}-$$.log" 2>&1 &
217232
res=$?
233+
234+
sleep 4
218235
osd_close
219236
fi
220237
fi

0 commit comments

Comments
 (0)