Skip to content

Commit adf1957

Browse files
kabicinkabicin
committed
Remove variable redundancy in configure-liberty.sh
1 parent 809890d commit adf1957

File tree

9 files changed

+9
-18
lines changed

9 files changed

+9
-18
lines changed

Diff for: ‎releases/22.0.0.12/full/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=false
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/22.0.0.12/kernel-slim/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=true
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/23.0.0.3/full/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=false
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/23.0.0.3/kernel-slim/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=true
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/23.0.0.5/full/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=false
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/23.0.0.5/kernel-slim/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=true
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/latest/beta/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=false
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/latest/full/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=false
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

Diff for: ‎releases/latest/kernel-slim/helpers/build/configure-liberty.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
OPT_PREFIX="/opt/ol"
4-
ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
54
ORIGINAL_SERVER_NAME="defaultServer"
65
IS_KERNEL=true
76

@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3433

3534
# Add new output folder symlink and resolve group write permissions
3635
SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
37-
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
36+
ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3837
mkdir -p $SERVER_OUTPUT_DIR
3938
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
4039

0 commit comments

Comments
 (0)