Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit e1ac6a2

Browse files
author
Corneil du Plessis
authored
zsh compatibility (#436)
* [Script] Ensure scripts are compatibly with zsh
1 parent 2a0324f commit e1ac6a2

22 files changed

+126
-126
lines changed

‎acceptance-tests/docker-images/oracle/dockerfiles/11.2.0.2/runOracle.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ function runUserScripts {
1010
echo "$0: No SCRIPTS_ROOT passed on, no scripts will be run";
1111
exit 1;
1212
fi;
13-
13+
1414
# Execute custom provided files (only if directory exists and has files in it)
1515
if [ -d "$SCRIPTS_ROOT" ] && [ -n "$(ls -A $SCRIPTS_ROOT)" ]; then
16-
16+
1717
echo "";
1818
echo "Executing user defined scripts"
19-
19+
2020
for f in $SCRIPTS_ROOT/*; do
2121
case "$f" in
2222
*.sh) echo "$0: running $f"; . "$f" ;;
@@ -25,26 +25,26 @@ function runUserScripts {
2525
esac
2626
echo "";
2727
done
28-
28+
2929
echo "DONE: Executing user defined scripts"
3030
echo "";
31-
31+
3232
fi;
33-
33+
3434
}
3535

3636
########### Move DB files ############
3737
function moveFiles {
3838
if [ ! -d $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID ]; then
3939
su -p oracle -c "mkdir -p $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/"
4040
fi;
41-
41+
4242
su -p oracle -c "mv $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/"
4343
su -p oracle -c "mv $ORACLE_HOME/dbs/orapw$ORACLE_SID $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/"
4444
su -p oracle -c "mv $ORACLE_HOME/network/admin/listener.ora $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/"
4545
su -p oracle -c "mv $ORACLE_HOME/network/admin/tnsnames.ora $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/"
4646
mv /etc/sysconfig/oracle-xe $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/
47-
47+
4848
symLinkFiles;
4949
}
5050

@@ -54,19 +54,19 @@ function symLinkFiles {
5454
if [ ! -L $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora ]; then
5555
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/spfile$ORACLE_SID.ora $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora
5656
fi;
57-
57+
5858
if [ ! -L $ORACLE_HOME/dbs/orapw$ORACLE_SID ]; then
5959
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/orapw$ORACLE_SID $ORACLE_HOME/dbs/orapw$ORACLE_SID
6060
fi;
61-
61+
6262
if [ ! -L $ORACLE_HOME/network/admin/listener.ora ]; then
6363
ln -sf $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/listener.ora $ORACLE_HOME/network/admin/listener.ora
6464
fi;
65-
65+
6666
if [ ! -L $ORACLE_HOME/network/admin/tnsnames.ora ]; then
6767
ln -sf $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/tnsnames.ora $ORACLE_HOME/network/admin/tnsnames.ora
6868
fi;
69-
69+
7070
if [ ! -L /etc/sysconfig/oracle-xe ]; then
7171
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/oracle-xe /etc/sysconfig/oracle-xe
7272
fi;
@@ -94,26 +94,26 @@ function createDB {
9494
sed -i -e "s|###ORACLE_PWD###|$ORACLE_PWD|g" $ORACLE_BASE/$CONFIG_RSP && \
9595
/etc/init.d/oracle-xe configure responseFile=$ORACLE_BASE/$CONFIG_RSP
9696

97-
# Listener
97+
# Listener
9898
echo "# listener.ora Network Configuration File:
99-
100-
SID_LIST_LISTENER =
99+
100+
SID_LIST_LISTENER =
101101
(SID_LIST =
102102
(SID_DESC =
103103
(SID_NAME = PLSExtProc)
104104
(ORACLE_HOME = $ORACLE_HOME)
105105
(PROGRAM = extproc)
106106
)
107107
)
108-
108+
109109
LISTENER =
110110
(DESCRIPTION_LIST =
111111
(DESCRIPTION =
112112
(ADDRESS = (PROTOCOL = IPC)(KEY = EXTPROC_FOR_XE))
113113
(ADDRESS = (PROTOCOL = TCP)(HOST = 0.0.0.0)(PORT = 1521))
114114
)
115115
)
116-
116+
117117
DEFAULT_SERVICE_LISTENER = (XE)" > $ORACLE_HOME/network/admin/listener.ora
118118

119119
# TNS Names.ora
@@ -142,7 +142,7 @@ EXTPROC_CONNECTION_DATA =
142142

143143
su -p oracle -c "sqlplus / as sysdba <<EOF
144144
EXEC DBMS_XDB.SETLISTENERLOCALACCESS(FALSE);
145-
145+
146146
ALTER DATABASE ADD LOGFILE GROUP 4 ('$ORACLE_BASE/oradata/$ORACLE_SID/redo04.log') SIZE 50m;
147147
ALTER DATABASE ADD LOGFILE GROUP 5 ('$ORACLE_BASE/oradata/$ORACLE_SID/redo05.log') SIZE 50m;
148148
ALTER DATABASE ADD LOGFILE GROUP 6 ('$ORACLE_BASE/oradata/$ORACLE_SID/redo06.log') SIZE 50m;
@@ -151,7 +151,7 @@ EXTPROC_CONNECTION_DATA =
151151
ALTER SYSTEM CHECKPOINT;
152152
ALTER DATABASE DROP LOGFILE GROUP 1;
153153
ALTER DATABASE DROP LOGFILE GROUP 2;
154-
154+
155155
ALTER SYSTEM SET db_recovery_file_dest='';
156156
exit;
157157
EOF"
@@ -178,18 +178,18 @@ if [ -d $ORACLE_BASE/oradata/$ORACLE_SID ]; then
178178
fi;
179179

180180
/etc/init.d/oracle-xe start | grep -qc "Oracle Database 11g Express Edition is not configured"
181-
if [ "$?" == "0" ]; then
181+
if [ "$?" = "0" ]; then
182182
# Check whether container has enough memory
183183
if [ `df -k /dev/shm | tail -n 1 | awk '{print $2}'` -lt 1048576 ]; then
184184
echo "Error: The container doesn't have enough memory allocated."
185185
echo "A database XE container needs at least 1 GB of shared memory (/dev/shm)."
186186
echo "You currently only have $((`df -k /dev/shm | tail -n 1 | awk '{print $2}'`/1024)) MB allocated to the container."
187187
exit 1;
188188
fi;
189-
189+
190190
# Create database
191191
createDB;
192-
192+
193193
# Execute custom provided setup scripts
194194
runUserScripts $ORACLE_BASE/scripts/setup
195195
fi;

‎acceptance-tests/docker-images/oracle/dockerfiles/12.1.0.2/installDBBinaries.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Since: December, 2016
77
# Author: [email protected]
88
# Description: Sets up the unix environment for DB installation.
9-
#
9+
#
1010
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11-
#
11+
#
1212

1313
EDITION=$1
1414

1515
# Check whether edition has been passed on
16-
if [ "$EDITION" == "" ]; then
16+
if [ "$EDITION" = "" ]; then
1717
echo "ERROR: No edition has been passed on!"
1818
echo "Please specify the correct edition!"
1919
exit 1;
@@ -27,14 +27,14 @@ if [ "$EDITION" != "EE" -a "$EDITION" != "SE2" ]; then
2727
fi;
2828

2929
# Check whether ORACLE_BASE is set
30-
if [ "$ORACLE_BASE" == "" ]; then
30+
if [ "$ORACLE_BASE" = "" ]; then
3131
echo "ERROR: ORACLE_BASE has not been set!"
3232
echo "You have to have the ORACLE_BASE environment variable set to a valid value!"
3333
exit 1;
3434
fi;
3535

3636
# Check whether ORACLE_HOME is set
37-
if [ "$ORACLE_HOME" == "" ]; then
37+
if [ "$ORACLE_HOME" = "" ]; then
3838
echo "ERROR: ORACLE_HOME has not been set!"
3939
echo "You have to have the ORACLE_HOME environment variable set to a valid value!"
4040
exit 1;

‎acceptance-tests/docker-images/oracle/dockerfiles/12.1.0.2/runOracle.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# LICENSE UPL 1.0
33
#
44
# Copyright (c) 1982-2016 Oracle and/or its affiliates. All rights reserved.
5-
#
5+
#
66
# Since: November, 2016
77
# Author: [email protected]
88
# Description: Runs the Oracle Database inside the container
9-
#
9+
#
1010
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11-
#
11+
#
1212

1313
########### Move DB files ############
1414
function moveFiles {
@@ -25,7 +25,7 @@ function moveFiles {
2525

2626
# oracle user does not have permissions in /etc, hence cp and not mv
2727
cp /etc/oratab $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/
28-
28+
2929
symLinkFiles;
3030
}
3131

@@ -35,11 +35,11 @@ function symLinkFiles {
3535
if [ ! -L $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora ]; then
3636
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/spfile$ORACLE_SID.ora $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora
3737
fi;
38-
38+
3939
if [ ! -L $ORACLE_HOME/dbs/orapw$ORACLE_SID ]; then
4040
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/orapw$ORACLE_SID $ORACLE_HOME/dbs/orapw$ORACLE_SID
4141
fi;
42-
42+
4343
if [ ! -L $ORACLE_HOME/network/admin/sqlnet.ora ]; then
4444
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/sqlnet.ora $ORACLE_HOME/network/admin/sqlnet.ora
4545
fi;
@@ -52,7 +52,7 @@ function symLinkFiles {
5252
ln -s $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/tnsnames.ora $ORACLE_HOME/network/admin/tnsnames.ora
5353
fi;
5454

55-
# oracle user does not have permissions in /etc, hence cp and not ln
55+
# oracle user does not have permissions in /etc, hence cp and not ln
5656
cp $ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/oratab /etc/oratab
5757

5858
}
@@ -97,7 +97,7 @@ EOF
9797

9898
# Check whether container has enough memory
9999
# Github issue #219: Prevent integer overflow,
100-
# only check if memory digits are less than 11 (single GB range and below)
100+
# only check if memory digits are less than 11 (single GB range and below)
101101
if [ `cat /sys/fs/cgroup/memory/memory.limit_in_bytes | wc -c` -lt 11 ]; then
102102
if [ `cat /sys/fs/cgroup/memory/memory.limit_in_bytes` -lt 2147483648 ]; then
103103
echo "Error: The container doesn't have enough memory allocated."
@@ -117,7 +117,7 @@ trap _term SIGTERM
117117
trap _kill SIGKILL
118118

119119
# Default for ORACLE SID
120-
if [ "$ORACLE_SID" == "" ]; then
120+
if [ "$ORACLE_SID" = "" ]; then
121121
export ORACLE_SID=ORCLCDB
122122
else
123123
# Check whether SID is no longer than 12 bytes
@@ -126,7 +126,7 @@ else
126126
echo "Error: The ORACLE_SID must only be up to 12 characters long."
127127
exit 1;
128128
fi;
129-
129+
130130
# Check whether SID is alphanumeric
131131
# Github issue #246: Cannot start OracleDB image
132132
if [[ "$ORACLE_SID" =~ [^a-zA-Z0-9] ]]; then
@@ -144,29 +144,29 @@ export ORACLE_CHARACTERSET=${ORACLE_CHARACTERSET:-AL32UTF8}
144144
# Check whether database already exists
145145
if [ -d $ORACLE_BASE/oradata/$ORACLE_SID ]; then
146146
symLinkFiles;
147-
147+
148148
# Make sure audit file destination exists
149149
if [ ! -d $ORACLE_BASE/admin/$ORACLE_SID/adump ]; then
150150
mkdir -p $ORACLE_BASE/admin/$ORACLE_SID/adump
151151
fi;
152-
152+
153153
# Start database
154154
$ORACLE_BASE/$START_FILE;
155-
155+
156156
else
157157
# Remove database config files, if they exist
158158
rm -f $ORACLE_HOME/dbs/spfile$ORACLE_SID.ora
159159
rm -f $ORACLE_HOME/dbs/orapw$ORACLE_SID
160160
rm -f $ORACLE_HOME/network/admin/sqlnet.ora
161161
rm -f $ORACLE_HOME/network/admin/listener.ora
162162
rm -f $ORACLE_HOME/network/admin/tnsnames.ora
163-
163+
164164
# Create database
165165
$ORACLE_BASE/$CREATE_DB_FILE $ORACLE_SID $ORACLE_PDB $ORACLE_PWD;
166-
166+
167167
# Move database operational files to oradata
168168
moveFiles;
169-
169+
170170
# Execute custom provided setup scripts
171171
$ORACLE_BASE/$USER_SCRIPTS_FILE $ORACLE_BASE/scripts/setup
172172
fi;
@@ -177,16 +177,16 @@ if [ $? -eq 0 ]; then
177177
echo "#########################"
178178
echo "DATABASE IS READY TO USE!"
179179
echo "#########################"
180-
180+
181181
# Execute custom provided startup scripts
182182
$ORACLE_BASE/$USER_SCRIPTS_FILE $ORACLE_BASE/scripts/startup
183-
183+
184184
else
185185
echo "#####################################"
186186
echo "########### E R R O R ###############"
187187
echo "DATABASE SETUP WAS NOT SUCCESSFUL!"
188188
echo "Please check output for further info!"
189-
echo "########### E R R O R ###############"
189+
echo "########### E R R O R ###############"
190190
echo "#####################################"
191191
fi;
192192

‎acceptance-tests/docker-images/oracle/dockerfiles/12.1.0.2/startDB.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# Author: [email protected]
88
# Description: Starts the Listener and Oracle Database.
99
# The ORACLE_HOME and the PATH has to be set.
10-
#
10+
#
1111
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
12-
#
12+
#
1313

1414
# Check that ORACLE_HOME is set
15-
if [ "$ORACLE_HOME" == "" ]; then
15+
if [ "$ORACLE_HOME" = "" ]; then
1616
script_name=`basename "$0"`
1717
echo "$script_name: ERROR - ORACLE_HOME is not set. Please set ORACLE_HOME and PATH before invoking this script."
1818
exit 1;

‎acceptance-tests/docker-images/oracle/dockerfiles/12.2.0.1/installDBBinaries.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Since: December, 2016
77
# Author: [email protected]
88
# Description: Sets up the unix environment for DB installation.
9-
#
9+
#
1010
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11-
#
11+
#
1212

1313
EDITION=$1
1414

1515
# Check whether edition has been passed on
16-
if [ "$EDITION" == "" ]; then
16+
if [ "$EDITION" = "" ]; then
1717
echo "ERROR: No edition has been passed on!"
1818
echo "Please specify the correct edition!"
1919
exit 1;
@@ -27,14 +27,14 @@ if [ "$EDITION" != "EE" -a "$EDITION" != "SE2" ]; then
2727
fi;
2828

2929
# Check whether ORACLE_BASE is set
30-
if [ "$ORACLE_BASE" == "" ]; then
30+
if [ "$ORACLE_BASE" = "" ]; then
3131
echo "ERROR: ORACLE_BASE has not been set!"
3232
echo "You have to have the ORACLE_BASE environment variable set to a valid value!"
3333
exit 1;
3434
fi;
3535

3636
# Check whether ORACLE_HOME is set
37-
if [ "$ORACLE_HOME" == "" ]; then
37+
if [ "$ORACLE_HOME" = "" ]; then
3838
echo "ERROR: ORACLE_HOME has not been set!"
3939
echo "You have to have the ORACLE_HOME environment variable set to a valid value!"
4040
exit 1;

0 commit comments

Comments
 (0)