Changeset 32005 for main/trunk

Show
Ignore:
Timestamp:
28.09.2017 18:58:45 (2 years ago)
Author:
ak19
Message:

Different (and simpler) fix for GS2 imagemagick env clash on sourcing GS2 setup vs running wget after sourcing setup. For GS2 binaries, we never had an imagemagick living in the ext folder, as we got one of our precompiled imagemagick binaries and only unpacked it in ext before moving it into the GS2/bin/OS folder. And now when compiling up GS2 with makegs2.sh, we have the new option of passing in imagemagick as an argument and it also grab the appropriate imagemagick binary and put it into GS2/bin/OS. In either case, there's no imagemagick in the ext folder, which may be for GS3 and/or when imagemagick is compiled up from scratch in a GS checkout.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/makegs2.sh

    r32004 r32005  
    66# If you pass in imagemagick, it will grab the appropriate linux/darwin binary, untar 
    77# this and put its OS subfolder renamed as imagemagick into the bin/os folder. 
     8 
     9# Note, Mac (darwin) machines don't always display all env vars on doing env/printenv,  
     10# e.g. DYLD_LIBRARY_PATH and DYLD_FALLBACK_LIBRARY_PATH are hidden 
     11# To display hidden vars follow: 
     12# http://www.commandlinefu.com/commands/view/6899/print-all-environment-variables-including-hidden-ones 
     13# but remove capital T from command, making: for _a in {A..Z} {a..z};do _z=\${!${_a}*};for _i in `eval echo "${_z}"`;do echo -e "$_i: ${!_i}";done;done|cat -Tsv 
     14# into: for _a in {A..Z} {a..z};do _z=\${!${_a}*};for _i in `eval echo "${_z}"`;do echo -e "$_i: ${!_i}";done;done|cat -sv 
     15# Can redirect the output of the command into files and do a diff to see difference in environment. 
    816 
    917getgnomelib= 
     
    117125       popd 
    118126   fi 
     127 
     128   # the setup script in the ext/imagemagick folder clashes with wget because it sets DYLD(_FALLBACK)_LIBRARY_PATH 
     129   # on sourcing GS2's setup.bash. Since we're not using the imagemagick in the ext folder for GS2, as the  
     130   # precompiled imagemagick binary is moved into GS2/bin/OS, in a GS2 bin release and now here too (in a compiled GS2), 
     131   # we can remove ext/imagemagick. The env vars it sets refer to the ext/imagemagick folder anyway, which we don't use 
     132   # for our GS2 binaries, or for GS2 compiled versions using the precompiled imagemagick binary, as imagemagick will 
     133   # live in GS2/bin/OS in such cases.. 
     134   rm -rf ext/imagemagick 
    119135    
    120136fi