Changeset 32787

Timestamp:

2019-02-20T19:14:07+13:00 (5 years ago)

Author:

ak19

Message:

Some more corrections and better var names before committing linux changes.

File:

• main/trunk/greenstone2/perllib/cpan/compile-dbd-mysql.sh (modified) (7 diffs)

main/trunk/greenstone2/perllib/cpan/compile-dbd-mysql.sh

@@ -43 +43 @@
 MYSQL_TARBALL="${MYSQL_BIN}-macos10.13-x86_64"
 
+
 # We want DBI::mysql version 1.634
 # see http://wiki.greenstone.org/doku.php?id=en:user_advanced:greenstonesqlplugs
 # and https://metacpan.org/pod/release/TIMB/DBI-1.634/lib/DBI/DBD.pm
-DBI_MYSQL=DBI-1.634
-DBI_MYSQL_DOWNLOAD=https://cpan.metacpan.org/authors/id/T/TI/TIMB/$DBI_MYSQL.tar.gz
+DBI_DBD=DBI-1.634
+DBI_DBD_DOWNLOAD=https://cpan.metacpan.org/authors/id/T/TI/TIMB/$DBI_DBD.tar.gz
 
 # We want DBD::mysql version 4.033
@@ -73 +74 @@
 TEMP_STATIC_LIBS_DIR=$GSDLHOME/$MYSQL_BIN/mysql-static
 MYSQL_DIR=$GSDLHOME/$MYSQL_BIN
-
 
 ##########################
@@ -127 +127 @@
 
 # download and untar DBI::DBD v 1.634
-if [ ! -d $GSDLHOME/$DBI_MYSQL ]; then
+if [ ! -d $GSDLHOME/$DBI_DBD ]; then
     cd $GSDLHOME
-    if [ ! -e $GSDLHOME/$DBI_MYSQL.tar.gz ]; then
+    if [ ! -e $GSDLHOME/$DBI_DBD.tar.gz ]; then
     echo "** Getting the DBI::DBD tarball"
-    wget $WGET_FLAGS $DBI_MYSQL_DOWNLOAD
+    wget $WGET_FLAGS $DBI_DBD_DOWNLOAD
     fi
     echo "** Extracting the DBI::DBD tarball into $GSDLHOME"
-    tar -xvzf $DBI_MYSQL.tar.gz
+    tar -xvzf $DBI_DBD.tar.gz
 fi
 # start compiling DBI::DBD into $TEMP_DBI_DBD_DIR
@@ -144 +144 @@
 mkdir $TEMP_DBI_DBD_DIR
 
-cd $GSDLHOME/$DBI_MYSQL
+cd $GSDLHOME/$DBI_DBD
 perl Makefile.PL \
     PREFIX=$TEMP_DBI_DBD_DIR
@@ -160 +160 @@
 #echo "EXITING"
 #exit
+
 
 # download and untar DBD::mysql v 4.033
@@ -187 +188 @@
 cd $CPAN_DIR
 mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_VERSION/darwin-thread-multi-2level/DBD $PERL_FOLDER/.
-mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_SUBVERSION/darwin-thread-multi-2level/auto/DBD $PERL_FOLDER/auto/.
+mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_VERSION/darwin-thread-multi-2level/auto/DBD $PERL_FOLDER/auto/.
 
 # clean up
@@ -195 +196 @@
     echo "** Will now delete temporary DBD::mysql products, and the untarred DBD::mysql"
     rm -rf $TEMP_DBI_DBD_DIR
-    rm -rf $GSDLHOME/$DBI_MYSQL
+    rm -rf $GSDLHOME/$DBI_DBD
     rm -rf $GSDLHOME/$DBD_MYSQL
 else