Skip to content

Commit

Permalink
Remove variable redundancy in configure-liberty.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
kabicin committed Jun 2, 2023
1 parent 83e5d32 commit 2178608
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 18 deletions.
3 changes: 1 addition & 2 deletions releases/22.0.0.12/full/helpers/build/configure-liberty.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions releases/23.0.0.3/full/helpers/build/configure-liberty.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions releases/23.0.0.5/full/helpers/build/configure-liberty.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions releases/latest/beta/helpers/build/configure-liberty.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions releases/latest/full/helpers/build/configure-liberty.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2178608

Please sign in to comment.