diff options
| -rw-r--r-- | system/oracle-instantclient-basic/README | 9 | ||||
| -rw-r--r-- | system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild | 73 |
2 files changed, 44 insertions, 38 deletions
diff --git a/system/oracle-instantclient-basic/README b/system/oracle-instantclient-basic/README index 7269943f7a2e..7692fde8ded9 100644 --- a/system/oracle-instantclient-basic/README +++ b/system/oracle-instantclient-basic/README @@ -5,12 +5,3 @@ JDBC-OCI applications. Oracle-xe and JRE or JDK packages are optional and depends on your needs. - -You need an Oracle account and you must Agree to Oracle's -download agreement before this can be downloaded. -You have to use a web browser to download it. - -Ensure that you download the correct RPM -"Instant Client Package - Basic" -For x86: oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm -For x86_64: oracle-instantclient12.1-basic-12.1.0.2.0-1.x86_64.rpm diff --git a/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild b/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild index 9fc51a485803..ccece206d78c 100644 --- a/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild +++ b/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild @@ -34,11 +34,15 @@ PKGTYPE=${PKGTYPE:-tgz} ORAVER="21" if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i386 ;; - x86_64) ARCH=x86_64 ;; - *) echo "Architecture not supported"; exit 0; - esac + ARCH=$( uname -m ) +fi + +# 2023-05-16 DW: moved above PRINT_PACKAGE_NAME +if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + echo "$ARCH architecture is unsupported." >/dev/stderr + exit 1 fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what @@ -54,12 +58,6 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - # recreating the name of the RPM RPMNAM="$PRGNAM-$VERSION-$RELEASE.$ARCH.rpm" set -e @@ -79,11 +77,11 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} fi -ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/\ -client${LIBDIRSUFFIX}" +# 2023-05-16 DW: I think this is safer on a single line +ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/client${LIBDIRSUFFIX}" # Testing if ORACLE already installed -if [ ! -z "${ORACLE_HOME}" ]; then +if [ "$ORACLE_HOME" ]; then # make symbolic links to client apps mkdir -p $PKG/$ORACLE_HOME/bin for app in $(ls $PKG/${ORACLE_CLIENT_HOME}/bin) ; do @@ -92,18 +90,39 @@ if [ ! -z "${ORACLE_HOME}" ]; then done fi +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + # Making csh file for profile.d mkdir -p $PKG/etc/profile.d/ cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh #!/bin/csh setenv ORACLE_CLIENT_HOME ${ORACLE_CLIENT_HOME} -if ( -z "\$ORACLE_HOME" ) then - setenv ORACLE_HOME \$ORACLE_CLIENT_HOME +# 2023-05-16 DW: csh syntax +if ( ! \$?ORACLE_HOME ) then + setenv ORACLE_HOME \$ORACLE_CLIENT_HOME +endif + +# 2023-05-16 DW: csh uses a lowercase path array +set path = ( \$path \$ORACLE_CLIENT_HOME/bin ) + +# 2023-05-16 DW: will set this, but braces to stop : modifier errors +setenv PATH \${PATH}:\${ORACLE_CLIENT_HOME}/bin + +# 2023-05-16 DW: test if CLASSPATH is set or not to avoid errors +if ( \$?CLASSPATH ) then + setenv CLASSPATH \${CLASSPATH}:\${ORACLE_CLIENT_HOME}/lib/ojdbc6.jar +else + setenv CLASSPATH \${ORACLE_CLIENT_HOME}/lib/ojdbc6.jar endif -setenv PATH \$PATH:\$ORACLE_CLIENT_HOME/bin -setenv CLASSPATH \$CLASSPATH:\$ORACLE_CLIENT_HOME/lib/ojdbc6.jar +# 2023-05-16 DW: it seems that this is also needed +if ( \$?LD_LIBRARY_PATH ) then + setenv LD_LIBRARY_PATH \${LD_LIBRARY_PATH}:\${ORACLE_CLIENT_HOME}/lib +else + setenv LD_LIBRARY_PATH \${ORACLE_CLIENT_HOME}/lib +endif EOF # Making sh file for profile.d @@ -117,6 +136,13 @@ fi export PATH=\$PATH:\$ORACLE_CLIENT_HOME/bin export CLASSPATH=\$CLASSPATH:\$ORACLE_CLIENT_HOME/lib/ojdbc6.jar + +# 2023-05-16 DW: add this here too JIC (untested) +if [ "\$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$ORACLE_CLIENT_HOME/lib +else + export LD_LIBRARY_PATH=\$ORACLE_CLIENT_HOME/lib +fi EOF chmod 755 $PKG/etc/profile.d/*sh @@ -126,16 +152,5 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Making doinst.sh file -cat << EOF > $PKG/install/doinst.sh -if ! grep $ORACLE_CLIENT_HOME/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then - echo "$ORACLE_CLIENT_HOME/lib" >> etc/ld.so.conf -fi - -if [ -x /sbin/ldconfig ]; then - /sbin/ldconfig 2> /dev/null -fi -EOF - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |