Skip to content

Fix three code bugs #2

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

Draft
4O4 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix three code bugs #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions miracle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ main() {
printf -- "--------------------------------------------------\n"

if [[ -z ${username} ]] || [[ -z ${password} ]]; then
printf "Missing username or password!\n\n"
return;
# Fail fast with a non-zero exit to avoid continuing silently
error ${LINENO} "Missing username or password!" 2
fi;

if [ ${#views[@]} -gt 0 ]; then
Expand Down Expand Up @@ -148,18 +148,20 @@ install_with_sqlplus() {
final_terminator="${command_terminator}"

# Avoid double command terminator
last_character="$(cat ${i} | remove_whitespace | tail -c 1)"
last_character="$(cat "${i}" | remove_whitespace | tail -c 1)"

if [[ "${last_character}" = "${final_terminator}" ]]; then
final_terminator=""
fi;

show_errors_cmd="$(cat ${i} | remove_newline | grep -Pio 'create .*?(package|package body|view|procedure) .*?[i|a]s ' | perl -pe 's/create .*?(package body|package|view|procedure) .*?((["]?[a-z]{1,20}["]?\.)?["]?[a-zA-Z0-9_]{1,30}["]?) .*?[i|a]s /show errors \1 \2;/gi' | tr -d "\"")"
show_errors_cmd="$(cat "${i}" | remove_newline | grep -Pio 'create .*?(package|package body|view|procedure) .*?(?:is|as) ' | perl -pe 's/create .*?(package body|package|view|procedure) .*?((["]?[a-z]{1,20}["]?\.)?["]?[a-zA-Z0-9_]{1,30}["]?) .*?(?:is|as) /show errors \1 \2;/gi' | tr -d "\"")"

printf "MIRACLE INFO: show_errors_cmd: ${show_errors_cmd}\n\n"

printf "${INSTALLATION_STARTED_FORMAT}" "Installing ${i}..."
result=$(sqlplus -s ${username}/${password} <<-EOF
# Avoid exposing credentials in process list: connect within SQL*Plus session
result=$(sqlplus -s /nolog <<-EOF
CONNECT ${username}/${password}
SET TERMOUT ON
SET SQLBLANKLINES ON
SET DEFINE OFF
Expand All @@ -171,10 +173,10 @@ install_with_sqlplus() {
show errors
${show_errors_cmd}
EOF
)
)
sqlplus_exit_code=$?

printf "${result}"
printf "%s" "${result}"

if [[ ! ${sqlplus_exit_code} -eq 0 ]] || [[ "${result}" == *"Errors for "* ]]; then
error ${LINENO}
Expand Down