Skip to content

Commit c492907

Browse files
amreoamreo
authored
Merge pull request #32 from amreo/master
Changed fetchers to use ORACLE_HOME from args
2 parents bb895df + f1f3834 commit c492907

File tree

18 files changed

+139
-33
lines changed

18 files changed

+139
-33
lines changed

‎fetch/addm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
export ORAENV_ASK=NO
2631
export ORACLE_SID=$SID
27-
. oraenv 1>/dev/null
32+
export ORACLE_HOME=$HOME
33+
export PATH=$HOME/bin:$PATH
2834

2935
ERCOLE_HOME=$(dirname "$0")
3036
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"

‎fetch/backup‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
export ORAENV_ASK=NO
2631
export ORACLE_SID=$SID
27-
. oraenv 1>/dev/null
32+
export ORACLE_HOME=$HOME
33+
export PATH=$HOME/bin:$PATH
2834

2935
ERCOLE_HOME=$(dirname "$0")
3036
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"

‎fetch/db‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,23 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
ERCOLE_HOME=$(dirname "$0")
2631
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"
2732

2833
export ORAENV_ASK=NO
2934
export ORACLE_SID=$SID
30-
. oraenv 1>/dev/null
35+
export ORACLE_HOME=$HOME
36+
export PATH=$HOME/bin:$PATH
3137

3238
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/db.sql

‎fetch/dbmounted‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,23 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
ERCOLE_HOME=$(dirname "$0")
2631
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"
2732

2833
export ORAENV_ASK=NO
2934
export ORACLE_SID=$SID
30-
. oraenv 1>/dev/null
35+
export ORACLE_HOME=$HOME
36+
export PATH=$HOME/bin:$PATH
3137

3238
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/dbmounted.sql

‎fetch/dbstatus‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
export ORAENV_ASK=NO
2631
export ORACLE_SID=$SID
27-
. oraenv 1>/dev/null
32+
export ORACLE_HOME=$HOME
33+
export PATH=$HOME/bin:$PATH
2834

2935
DB_STATUS=$(sqlplus -S / as sysdba << EOF
3036
set pages 0 feedback off

‎fetch/dbversion‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
SID=$1
19+
HOME=$2
1920

2021
if [ -z "$SID" ]; then
2122
echo "Missing SID parameter"
2223
exit 1
2324
fi
25+
if [ -z "$HOME" ]; then
26+
echo "Missing ORACLE_HOME parameter"
27+
exit 1
28+
fi
2429

2530
export ORAENV_ASK=NO
2631
export ORACLE_SID=$SID
27-
. oraenv 1>/dev/null
32+
export ORACLE_HOME=$HOME
33+
export PATH=$HOME/bin:$PATH
2834

2935
DB_VERSION=$(sqlplus -S / as sysdba << EOF
3036
set pages 0 feedback off

‎fetch/feature‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,20 @@ if [ -z "$DBV" ]; then
2929
exit 1
3030
fi
3131

32+
HOME=$3
33+
34+
if [ -z "$HOME" ]; then
35+
echo "Missing ORACLE_HOME parameter"
36+
exit 1
37+
fi
38+
3239
ERCOLE_HOME=$(dirname "$0")
3340
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"
3441

3542
export ORAENV_ASK=NO
3643
export ORACLE_SID=$SID
37-
. oraenv 1>/dev/null
44+
export ORACLE_HOME=$HOME
45+
export PATH=$HOME/bin:$PATH
3846

3947
if [ $DBV == "11" ] || [ $DBV == "12" ]; then
4048
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/feature.sql

‎fetch/license‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
SID=$1
1919
DBV=$2
2020
TYPE=$3
21+
HOME=$4
2122

2223
if [ -z "$SID" ]; then
2324
echo "Missing SID parameter"
@@ -34,12 +35,19 @@ if [ -z "$DBV" ]; then
3435
exit 1
3536
fi
3637

38+
if [ -z "$HOME" ]; then
39+
echo "Missing ORACLE_HOME parameter"
40+
exit 1
41+
fi
42+
43+
3744
ERCOLE_HOME=$(dirname "$0")
3845
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"
3946

4047
export ORAENV_ASK=NO
4148
export ORACLE_SID=$SID
42-
. oraenv 1>/dev/null
49+
export ORACLE_HOME=$HOME
50+
export PATH=$HOME/bin:$PATH
4351

4452
DB_VERSION=$(sqlplus -S / as sysdba << EOF
4553
set pages 0 feedback off

‎fetch/oratab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ if [ -z "$ORATAB" ]; then
2222
exit 1
2323
fi
2424

25-
grep -o '^[A-Za-Z0-9].*\:\/' $ORATAB|awk -F ':' '{print $1}'
25+
sed 's/#.*$//' $ORATAB | grep -v "^$"

‎fetch/patch‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,21 @@ if [ -z "$DBV" ]; then
2929
exit 1
3030
fi
3131

32+
HOME=$3
33+
34+
if [ -z "$HOME" ]; then
35+
echo "Missing ORACLE_HOME parameter"
36+
exit 1
37+
fi
38+
39+
3240
ERCOLE_HOME=$(dirname "$0")
3341
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"
3442

3543
export ORAENV_ASK=NO
3644
export ORACLE_SID=$SID
37-
. oraenv 1>/dev/null
45+
export ORACLE_HOME=$HOME
46+
export PATH=$HOME/bin:$PATH
3847

3948
if [ $DBV == "12" ]; then
4049
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/patch-12.sql

0 commit comments

Comments
 (0)