Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove logs from configure.sh #3912

Merged
merged 3 commits into from
Nov 26, 2024
Merged

chore: remove logs from configure.sh #3912

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3d8909
remove log line
Nov 26, 2024
dd938c3
add java to PATH in configure.sh
MarkAckert Nov 26, 2024
0ce2846
fix potential encoding issues for static definition
MarkAckert Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions discovery-package/src/main/resources/bin/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ if [ -z "$ZWE_zowe_workspaceDirectory" ]; then
exit 1
fi

echo "$(env)" > $ZWE_zowe_workspaceDirectory/api-mediation/api-defs/env

INSTANCE_ID=$ZWE_haInstance_id

if [ -z "$INSTANCE_ID" ]; then
Expand All @@ -33,12 +31,20 @@ if [ "$ZWE_zowe_network_client_tls_attls" = "true" ]; then
ZOSMF_SCHEME=http
fi

if [ -n "$JAVA_HOME" ]; then
PATH=$JAVA_HOME/bin:$PATH
elif [ -n "$ZWE_java_home" ]; then
PATH=$ZWE_java_home/bin:$PATH
else
echo "[discovery-configure.sh]: java_home not found, discovery service relying on PATH to find java"
fi

if [ -e "$SOURCE_FILE" ]; then
chtag -tc ISO8859-1 $SOURCE_FILE
sed -e "s|%ZOSMF_SCHEME%|${ZOSMF_SCHEME}|g" $SOURCE_FILE > $DEST_FILE
iconv -f IBM-1047 -t ISO8859-1 $DEST_FILE > $SOURCE_FILE
chtag -tc ISO8859-1 $SOURCE_FILE
# _BPXK_AUTOCVT is set on some systems and resulted in twice-converted files when run through chtag and sed
_BPXK_AUTOCVT="OFF" sed -W filecodeset=ISO8859-1 -e "s|%ZOSMF_SCHEME%|${ZOSMF_SCHEME}|g" $SOURCE_FILE >$DEST_FILE # implicit EBCDIC out
iconv -f IBM-1047 -t ISO8859-1 $DEST_FILE >$SOURCE_FILE
_BPXK_AUTOCVT="OFF" chtag -tc ISO8859-1 $SOURCE_FILE
rm -f $DEST_FILE
else
echo "File $SOURCE_FILE not found"
echo "[discovery-configure.sh]: File $SOURCE_FILE not found"
fi
Loading