Changeset 35417 for main/trunk

Timestamp:

2021-09-17T17:05:12+12:00 (3 years ago)

Author:

davidb

Message:

Some fine-tuning of echo statements, including a test to determine if install is Greenstone2 or Greenstone2-Buildtime

File:

• main/trunk/greenstone2/setup.bash (modified) (6 diffs)

main/trunk/greenstone2/setup.bash

@@ -68 +68 @@
 fi
 
+  
 if test -n "$gsdl_not_sourced" ; then
   case "$gsdllang" in
@@ -115 +116 @@
   case "$gsdllang" in
   "es")
-    echo '¡Su ambiente ya está listo para Greenstone!' | eval $gsdliconv
+    echo "¡Su ambiente ya está listo para $GSDL2_DESC!" | eval $gsdliconv
   ;;
   "fr")
-    echo 'Votre environnement est déjà préparé pour Greenstone!' | eval $gsdliconv
+    echo "Votre environnement est déjà préparé pour $GSDL2_DESC!" | eval $gsdliconv
  ;;
   "ru")
-    echo '÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÕÖÅ ÎÁÓÔÒÏÅÎÏ ÄÌÑ Greenstone!' | eval $gsdliconv
+    echo "÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÕÖÅ ÎÁÓÔÒÏÅÎÏ ÄÌÑ $GSDL2_DESC!" | eval $gsdliconv
   ;;
   *)
-    echo 'Your environment is already set up for Greenstone!'
+    echo "Your environment is already set up for $GSDL2_DESC!"
   ;;
   esac
@@ -150 +151 @@
   GSDLHOME=`pwd`
   export GSDLHOME
+
+  GSDL2_DESC="Greenstone2"
+  if test ${GSDLHOME##*/} = "gs2build" ; then
+      GSDL2_DESC="$GSDL2_DESC-Buildtime"
+  fi
+  export GSDL2_DESC
 
   if test "x$GSDLOS" = "x" ; then
@@ -243 +250 @@
   case "$gsdllang" in
     "es")
-      echo 'Su ambiente ha sido configurado para correr los programas Greenstone.' | eval $gsdliconv
+      echo "Su ambiente ha sido configurado para correr los programas $GSDL2_DESC." | eval $gsdliconv
     ;;
     "fr")
-      echo 'Votre environnement a été configuére avec succès pour exécuter Greenstone' | eval $gsdliconv
+      echo "Votre environnement a été configuére avec succès pour exécuter $GSDL2_DESC" | eval $gsdliconv
     ;;
     "ru")
 eval $gsdliconv <<EOF
-÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÂÙÌÏ ÕÓÐÅÛÎÏ ÎÁÓÔÒÏÅÎÏ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ Greenstone
+÷ÁÛÅ ÏËÒÕÖÅÎÉÅ ÂÙÌÏ ÕÓÐÅÛÎÏ ÎÁÓÔÒÏÅÎÏ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ $GSDL2_DESC
 EOF
     ;;
     *)
-      echo 'Your environment has successfully been set up to run Greenstone'
+      echo "Your environment has successfully been set up to run $GSDL2_DESC"
     ;;
   esac
@@ -370 +377 @@
 if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl" ] ; then
 
-    if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin" ] ; then
-        PERLPATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin
-        export PERLPATH
-        PATH=$PERLPATH:$PATH
-        export PATH
-    fi   
+    if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin" ] ; then
+    PERLPATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin
+    export PERLPATH
+    PATH=$PERLPATH:$PATH
+    export PATH
+    fi   
 
     if test "$GSDLOS" = "linux" ; then
@@ -393 +400 @@
 
     echo ""
-    echo "***** Perl installation detected inside Greenstone."
-    echo "Command-line scripts need to be run with \"perl -S ...\""
-    echo "    e.g. perl -S import.pl -removeold demo"
-    echo ""
+    echo "  - Detected Perl installation inside $GSDL2_DESC."
+#    echo "Command-line scripts need to be run with \"perl -S ...\""
+#    echo "    e.g. perl -S import.pl -removeold demo"
+#    echo ""
 # else we may in future need to update PERL5LIB with some other (further) locations
 fi