Skip to content

Commit 9561fec

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'solaris-shell-fixes' into 'main'
Fixing sh scripts to run on Solaris See merge request weblogic-cloud/weblogic-deploy-tooling!1497
2 parents dc36fe7 + 91307f1 commit 9561fec

13 files changed

+31
-30
lines changed

‎installer/src/main/bin/archiveHelper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
WLSDEPLOY_PROGRAM_NAME="archiveHelper"; export WLSDEPLOY_PROGRAM_NAME
2828

29-
scriptPath=$(dirname "$0")
29+
scriptPath=`dirname "$0"`
3030

3131
. "$scriptPath/shared.sh"
3232

‎installer/src/main/bin/compareModel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ usage() {
6464

6565
WLSDEPLOY_PROGRAM_NAME="compareModel"; export WLSDEPLOY_PROGRAM_NAME
6666

67-
scriptName=$(basename "$0")
68-
scriptPath=$(dirname "$0")
67+
scriptName=`basename "$0"`
68+
scriptPath=`dirname "$0"`
6969

7070
. "$scriptPath/shared.sh"
7171

‎installer/src/main/bin/createDomain.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ usage() {
144144

145145
WLSDEPLOY_PROGRAM_NAME="createDomain"; export WLSDEPLOY_PROGRAM_NAME
146146

147-
scriptName=$(basename "$0")
148-
scriptPath=$(dirname "$0")
147+
scriptName=`basename "$0"`
148+
scriptPath=`dirname "$0"`
149149

150150
. "$scriptPath/shared.sh"
151151

@@ -154,7 +154,7 @@ umask 27
154154
checkArgs "$@"
155155

156156
minJdkVersion=7
157-
if [ "$USE_ENCRYPTION" == "true" ]; then
157+
if [ "$USE_ENCRYPTION" = "true" ]; then
158158
minJdkVersion=8
159159
fi
160160

‎installer/src/main/bin/deployApps.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ usage() {
125125

126126
WLSDEPLOY_PROGRAM_NAME="deployApps"; export WLSDEPLOY_PROGRAM_NAME
127127

128-
scriptName=$(basename "$0")
129-
scriptPath=$(dirname "$0")
128+
scriptName=`basename "$0"`
129+
scriptPath=`dirname "$0"`
130130

131131
. "$scriptPath/shared.sh"
132132

@@ -135,7 +135,7 @@ umask 27
135135
checkArgs "$@"
136136

137137
minJdkVersion=7
138-
if [ "$USE_ENCRYPTION" == "true" ]; then
138+
if [ "$USE_ENCRYPTION" = "true" ]; then
139139
minJdkVersion=8
140140
fi
141141

‎installer/src/main/bin/discoverDomain.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ usage() {
112112

113113
WLSDEPLOY_PROGRAM_NAME="discoverDomain"; export WLSDEPLOY_PROGRAM_NAME
114114

115-
scriptName=$(basename "$0")
116-
scriptPath=$(dirname "$0")
115+
scriptName=`basename "$0"`
116+
scriptPath=`dirname "$0"`
117117

118118
. "$scriptPath/shared.sh"
119119

@@ -122,7 +122,7 @@ umask 27
122122
checkArgs "$@"
123123

124124
minJdkVersion=7
125-
if [ "$USE_ENCRYPTION" == "true" ]; then
125+
if [ "$USE_ENCRYPTION" = "true" ]; then
126126
minJdkVersion=8
127127
fi
128128

‎installer/src/main/bin/encryptModel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ usage() {
7474

7575
WLSDEPLOY_PROGRAM_NAME="encryptModel"; export WLSDEPLOY_PROGRAM_NAME
7676

77-
scriptName=$(basename "$0")
78-
scriptPath=$(dirname "$0")
77+
scriptName=`basename "$0"`
78+
scriptPath=`dirname "$0"`
7979

8080
. "$scriptPath/shared.sh"
8181

‎installer/src/main/bin/extractDomainResource.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ usage() {
7070

7171
WLSDEPLOY_PROGRAM_NAME="extractDomainResource"; export WLSDEPLOY_PROGRAM_NAME
7272

73-
scriptName=$(basename "$0")
74-
scriptPath=$(dirname "$0")
73+
scriptName=`basename "$0"`
74+
scriptPath=`dirname "$0"`
7575

7676
. "$scriptPath/shared.sh"
7777

@@ -80,7 +80,7 @@ umask 27
8080
checkJythonArgs "$@"
8181

8282
minJdkVersion=7
83-
if [ "$USE_ENCRYPTION" == "true" ]; then
83+
if [ "$USE_ENCRYPTION" = "true" ]; then
8484
minJdkVersion=8
8585
fi
8686

‎installer/src/main/bin/injectVariables.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ usage() {
7373

7474
WLSDEPLOY_PROGRAM_NAME="injectVariables"; export WLSDEPLOY_PROGRAM_NAME
7575

76-
scriptName=$(basename "$0")
77-
scriptPath=$(dirname "$0")
76+
scriptName=`basename "$0"`
77+
scriptPath=`dirname "$0"`
7878

7979
. "$scriptPath/shared.sh"
8080

‎installer/src/main/bin/modelHelp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ usage() {
7575

7676
WLSDEPLOY_PROGRAM_NAME="modelHelp"; export WLSDEPLOY_PROGRAM_NAME
7777

78-
scriptName=$(basename "$0")
79-
scriptPath=$(dirname "$0")
78+
scriptName=`basename "$0"`
79+
scriptPath=`dirname "$0"`
8080

8181
. "$scriptPath/shared.sh"
8282

‎installer/src/main/bin/prepareModel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ usage() {
6868

6969
WLSDEPLOY_PROGRAM_NAME="prepareModel"; export WLSDEPLOY_PROGRAM_NAME
7070

71-
scriptName=$(basename "$0")
72-
scriptPath=$(dirname "$0")
71+
scriptName=`basename "$0"`
72+
scriptPath=`dirname "$0"`
7373

7474
. "$scriptPath/shared.sh"
7575

0 commit comments

Comments
 (0)