Changeset 19155
- Timestamp:
- 2009-04-21T13:49:49+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/gli.sh
r18988 r19155 129 129 _version= 130 130 if [ "x$gsdlpath" != "x" ]; then 131 get_version $gsdlpath131 get_version "$gsdlpath" 132 132 _version=$? 133 133 # otherwise $gsdlpath is not yet set … … 158 158 # Still need to find what version we are running: 159 159 # GS3 main directory contains file gs3-setup.sh, GS2 only setup.bash 160 get_version $gsdlpath160 get_version "$gsdlpath" 161 161 _version=$? 162 162 fi … … 166 166 167 167 # Check that the main Greenstone installation for the version we're running looks OK 168 check_installation $gsdlpath $_version $glilang168 check_installation "$gsdlpath" "$_version" "$glilang" 169 169 170 170 … … 206 206 fi 207 207 # Check that Greenstone 3's Greenstone 2 stuff looks OK (in gs2build) 208 check_installation $gsdl2path "" $glilang208 check_installation "$gsdl2path" "" "$glilang" 209 209 210 210 # Setup Greenstone 3's gs2build, unless it has already been done … … 308 308 fi 309 309 310 javapath= `$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION`310 javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`" 311 311 312 312 if [ "$?" != "0" ]; then 313 313 314 OLDVER= `"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`314 OLDVER="`"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`" 315 315 316 316 if [ "$?" = "0" ]; then
Note:
See TracChangeset
for help on using the changeset viewer.