Changeset 32787

Show
Ignore:
Timestamp:
20.02.2019 19:14:07 (8 months ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/cpan/compile-dbd-mysql.sh

    r32786 r32787  
    4343MYSQL_TARBALL="${MYSQL_BIN}-macos10.13-x86_64" 
    4444 
     45 
    4546# We want DBI::mysql version 1.634 
    4647# see http://wiki.greenstone.org/doku.php?id=en:user_advanced:greenstonesqlplugs 
    4748# and https://metacpan.org/pod/release/TIMB/DBI-1.634/lib/DBI/DBD.pm 
    48 DBI_MYSQL=DBI-1.634 
    49 DBI_MYSQL_DOWNLOAD=https://cpan.metacpan.org/authors/id/T/TI/TIMB/$DBI_MYSQL.tar.gz 
     49DBI_DBD=DBI-1.634 
     50DBI_DBD_DOWNLOAD=https://cpan.metacpan.org/authors/id/T/TI/TIMB/$DBI_DBD.tar.gz 
    5051 
    5152# We want DBD::mysql version 4.033 
     
    7374TEMP_STATIC_LIBS_DIR=$GSDLHOME/$MYSQL_BIN/mysql-static 
    7475MYSQL_DIR=$GSDLHOME/$MYSQL_BIN 
    75  
    7676 
    7777########################## 
     
    127127 
    128128# download and untar DBI::DBD v 1.634 
    129 if [ ! -d $GSDLHOME/$DBI_MYSQL ]; then 
     129if [ ! -d $GSDLHOME/$DBI_DBD ]; then 
    130130    cd $GSDLHOME 
    131     if [ ! -e $GSDLHOME/$DBI_MYSQL.tar.gz ]; then 
     131    if [ ! -e $GSDLHOME/$DBI_DBD.tar.gz ]; then 
    132132    echo "** Getting the DBI::DBD tarball" 
    133     wget $WGET_FLAGS $DBI_MYSQL_DOWNLOAD 
     133    wget $WGET_FLAGS $DBI_DBD_DOWNLOAD 
    134134    fi 
    135135    echo "** Extracting the DBI::DBD tarball into $GSDLHOME" 
    136     tar -xvzf $DBI_MYSQL.tar.gz 
     136    tar -xvzf $DBI_DBD.tar.gz 
    137137fi 
    138138# start compiling DBI::DBD into $TEMP_DBI_DBD_DIR 
     
    144144mkdir $TEMP_DBI_DBD_DIR 
    145145 
    146 cd $GSDLHOME/$DBI_MYSQL 
     146cd $GSDLHOME/$DBI_DBD 
    147147perl Makefile.PL \ 
    148148    PREFIX=$TEMP_DBI_DBD_DIR 
     
    160160#echo "EXITING" 
    161161#exit 
     162 
    162163 
    163164# download and untar DBD::mysql v 4.033 
     
    187188cd $CPAN_DIR 
    188189mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_VERSION/darwin-thread-multi-2level/DBD $PERL_FOLDER/. 
    189 mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_SUBVERSION/darwin-thread-multi-2level/auto/DBD $PERL_FOLDER/auto/. 
     190mv $TEMP_DBI_DBD_DIR/lib/perl5/site_perl/$PERL_FULL_VERSION/darwin-thread-multi-2level/auto/DBD $PERL_FOLDER/auto/. 
    190191 
    191192# clean up 
     
    195196    echo "** Will now delete temporary DBD::mysql products, and the untarred DBD::mysql" 
    196197    rm -rf $TEMP_DBI_DBD_DIR 
    197     rm -rf $GSDLHOME/$DBI_MYSQL 
     198    rm -rf $GSDLHOME/$DBI_DBD 
    198199    rm -rf $GSDLHOME/$DBD_MYSQL 
    199200else