From 21786084ac6ab3204ce6797917d462fd5e9caed5 Mon Sep 17 00:00:00 2001 From: kabicin Date: Wed, 31 May 2023 16:34:37 -0400 Subject: [PATCH] Remove variable redundancy in configure-liberty.sh --- releases/22.0.0.12/full/helpers/build/configure-liberty.sh | 3 +-- .../22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh | 3 +-- releases/23.0.0.3/full/helpers/build/configure-liberty.sh | 3 +-- .../23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh | 3 +-- releases/23.0.0.5/full/helpers/build/configure-liberty.sh | 3 +-- .../23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh | 3 +-- releases/latest/beta/helpers/build/configure-liberty.sh | 3 +-- releases/latest/full/helpers/build/configure-liberty.sh | 3 +-- releases/latest/kernel-slim/helpers/build/configure-liberty.sh | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/releases/22.0.0.12/full/helpers/build/configure-liberty.sh b/releases/22.0.0.12/full/helpers/build/configure-liberty.sh index 57343c15..b1f3587a 100755 --- a/releases/22.0.0.12/full/helpers/build/configure-liberty.sh +++ b/releases/22.0.0.12/full/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=false @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh b/releases/22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh index 465cf858..487f6d78 100755 --- a/releases/22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh +++ b/releases/22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=true @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/23.0.0.3/full/helpers/build/configure-liberty.sh b/releases/23.0.0.3/full/helpers/build/configure-liberty.sh index 57343c15..b1f3587a 100755 --- a/releases/23.0.0.3/full/helpers/build/configure-liberty.sh +++ b/releases/23.0.0.3/full/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=false @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh b/releases/23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh index 465cf858..487f6d78 100755 --- a/releases/23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh +++ b/releases/23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=true @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/23.0.0.5/full/helpers/build/configure-liberty.sh b/releases/23.0.0.5/full/helpers/build/configure-liberty.sh index 57343c15..b1f3587a 100755 --- a/releases/23.0.0.5/full/helpers/build/configure-liberty.sh +++ b/releases/23.0.0.5/full/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=false @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh b/releases/23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh index 465cf858..487f6d78 100755 --- a/releases/23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh +++ b/releases/23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=true @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/latest/beta/helpers/build/configure-liberty.sh b/releases/latest/beta/helpers/build/configure-liberty.sh index 57343c15..b1f3587a 100755 --- a/releases/latest/beta/helpers/build/configure-liberty.sh +++ b/releases/latest/beta/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=false @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/latest/full/helpers/build/configure-liberty.sh b/releases/latest/full/helpers/build/configure-liberty.sh index 57343c15..b1f3587a 100755 --- a/releases/latest/full/helpers/build/configure-liberty.sh +++ b/releases/latest/full/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=false @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output diff --git a/releases/latest/kernel-slim/helpers/build/configure-liberty.sh b/releases/latest/kernel-slim/helpers/build/configure-liberty.sh index 465cf858..487f6d78 100755 --- a/releases/latest/kernel-slim/helpers/build/configure-liberty.sh +++ b/releases/latest/kernel-slim/helpers/build/configure-liberty.sh @@ -1,7 +1,6 @@ #!/bin/bash OPT_PREFIX="/opt/ol" -ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output" ORIGINAL_SERVER_NAME="defaultServer" IS_KERNEL=true @@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se # Add new output folder symlink and resolve group write permissions SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME - ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME + ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME mkdir -p $SERVER_OUTPUT_DIR ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output