Skip to content

Commit 9f2d675

Browse files
committed
fix: 🐛 streamline curl linking logic in Zscaler wrapper installation
1 parent 70fb6de commit 9f2d675

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

src/zscaler/configure-wrapper.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,14 @@ fi
4040
zz_log i "Installing Zscaler curl wrapper to {U $WRAPPER_TARGET}"
4141
run_as_root install -m 755 "$WRAPPER_SOURCE" "$WRAPPER_TARGET"
4242

43-
if [ -L "$CURL_BIN" ] && [ "$(readlink -f "$CURL_BIN")" = "$WRAPPER_TARGET" ]; then
44-
zz_log w "curl is already routed through Zscaler wrapper"
45-
else
46-
if [ ! -e "$CURL_REAL_BIN" ]; then
47-
zz_log i "Preserving original curl as {U $CURL_REAL_BIN}"
48-
run_as_root mv "$CURL_BIN" "$CURL_REAL_BIN"
49-
fi
50-
51-
zz_log i "Linking {U $CURL_BIN} to {U $WRAPPER_TARGET}"
52-
run_as_root ln -sfn "$WRAPPER_TARGET" "$CURL_BIN"
43+
if [ ! -e "$CURL_REAL_BIN" ]; then
44+
zz_log i "Preserving original curl as {U $CURL_REAL_BIN}"
45+
run_as_root mv "$CURL_BIN" "$CURL_REAL_BIN"
5346
fi
5447

48+
zz_log i "Linking {U $CURL_BIN} to {U $WRAPPER_TARGET}"
49+
run_as_root ln -sfn "$WRAPPER_TARGET" "$CURL_BIN"
50+
5551
zz_log i "Installing curl configuration to {U $CURRENT_HOME/.curlrc}"
5652
run_as_root install -m 644 "$CURLRC_SOURCE" "$CURRENT_HOME/.curlrc"
5753
run_as_root chown "$CURRENT_USER":"$(id -gn "$CURRENT_USER")" "$CURRENT_HOME/.curlrc"

0 commit comments

Comments
 (0)