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.

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

Hide keystore logs #548

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions releases/23.0.0.12/full/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -79,8 +77,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/23.0.0.12/full/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/23.0.0.12/full/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
8 changes: 4 additions & 4 deletions releases/23.0.0.12/kernel-slim/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -38,8 +36,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
4 changes: 1 addition & 3 deletions releases/23.0.0.12/kernel-slim/helpers/build/features.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/23.0.0.12/kernel-slim/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/23.0.0.12/kernel-slim/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
8 changes: 4 additions & 4 deletions releases/24.0.0.3/full/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -79,8 +77,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/24.0.0.3/full/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/24.0.0.3/full/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
8 changes: 4 additions & 4 deletions releases/24.0.0.3/kernel-slim/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -38,8 +36,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
4 changes: 1 addition & 3 deletions releases/24.0.0.3/kernel-slim/helpers/build/features.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/24.0.0.3/kernel-slim/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/24.0.0.3/kernel-slim/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
8 changes: 4 additions & 4 deletions releases/24.0.0.5/full/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -79,8 +77,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/24.0.0.5/full/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/24.0.0.5/full/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
8 changes: 4 additions & 4 deletions releases/24.0.0.5/kernel-slim/helpers/build/configure.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -38,8 +36,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml >$SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down
4 changes: 1 addition & 3 deletions releases/24.0.0.5/kernel-slim/helpers/build/features.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
17 changes: 17 additions & 0 deletions releases/24.0.0.5/kernel-slim/helpers/build/internal/logger.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
4 changes: 1 addition & 3 deletions releases/24.0.0.5/kernel-slim/helpers/build/populate_scc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ol/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
Loading