Changeset 772

Timestamp:

01/28/14 21:39:16 (10 years ago)

Author:

davidb

Message:

Files for being 'sourced' changed from .sh to .bash

Location:

trunk

Files:

• expeditee-devel.bash (moved) (moved from trunk/expeditee-devel.sh ) (2 diffs)
• expeditee-setup.bash (moved) (moved from trunk/expeditee-setup.sh ) (8 diffs)

trunk/expeditee-devel.bash

@@ -1 +1 @@
 
-. expeditee-setup.sh
+. expeditee-setup.bash
 
 
@@ -31 +31 @@
 export PATH="$expeditee_home/dev/bin/script:$PATH"
 
-if test -e local-devel.sh ; then
-    echo "+ Sourcing local-devel.sh"
-    . ./local-devel.sh
+if test -e local-devel.bash ; then
+    echo "+ Sourcing local-devel.bash"
+    . ./local-devel.bash
 fi
 

trunk/expeditee-setup.bash

@@ -80 +80 @@
 # make sure we are sourced, and not run
 
-if test "$0" != "`echo $0 | sed s/expeditee-setup\.sh//`" ; then
-# if $0 contains "expeditee-setup.sh" we've been run... $0 is shellname if sourced.
+if test "$0" != "`echo $0 | sed s/expeditee-setup\.bash//`" ; then
+# if $0 contains "expeditee-setup.bash" we've been run... $0 is shellname if sourced.
 # One exception is zsh has an option to set it temporarily to the script name
   if test -z "$ZSH_NAME" ; then
@@ -94 +94 @@
 eval $expiconv <<EOF
       Error: Asegúrese de compilar este guión, no de ejecutarlo. P. ej.:
-         $ source expeditee-setup.sh
+         $ source expeditee-setup.bash
       o
-         $ . ./expeditee-setup.sh
+         $ . ./expeditee-setup.bash
       no
-         $ ./expeditee-setup.sh
+         $ ./expeditee-setup.bash
 EOF
   ;;
@@ -104 +104 @@
 eval $expiconv <<EOF
       Erreur: Assurez-vous de "sourcer" le script, plutôt que de l'exécuter. Ex:
-         $ source expeditee-setup.sh
+         $ source expeditee-setup.bash
       ou
-         $ . ./expeditee-setup.sh
+         $ . ./expeditee-setup.bash
       pas
-         $ ./expeditee-setup.sh
+         $ ./expeditee-setup.bash
 EOF
   ;;
@@ -115 +115 @@
       ïÛÉÂËÁ: õÄÏÓÔÏ×ÅÒØÔÅÓØ × ÉÓÔÏÞÎÉËÅ ÜÔÏÇÏ ÓËÒÉÐÔÁ. îÅ ÉÓÐÏÌÎÑÊÔÅ ÅÇÏ.
       îÁÐÒÉÍÅÒ:
-         $ source expeditee-setup.sh
+         $ source expeditee-setup.bash
       ÉÌÉ
-         $ . ./expeditee-setup.sh
+         $ . ./expeditee-setup.bash
       ÎÅÔ
-         $ ./expeditee-setup.sh
+         $ ./expeditee-setup.bash
 EOF
   ;;
@@ -125 +125 @@
 eval $expiconv <<EOF
         Error: Make sure you source this script, not execute it. Eg:
-                $ source expeditee-setup.sh
+                $ source expeditee-setup.bash
         or
-                $ . ./expeditee-setup.sh
+                $ . ./expeditee-setup.bash
         not
-                $ ./expeditee-setup.sh
+                $ ./expeditee-setup.bash
 EOF
   ;;
@@ -148 +148 @@
   ;;
   esac
-elif test ! -f expeditee-setup.sh ; then
+elif test ! -f expeditee-setup.bash ; then
   case "$explang" in
     "es")
@@ -188 +188 @@
   UNAME_HW_MACH=`uname -m`
 
-  # Following test came from VirtualBox's Guest Additions autostart.sh
+  # Following test came from VirtualBox's Guest Additions autostart.bash
   # (adapted for use in Expeditee)
   case "$UNAME_HW_MACH" in
@@ -246 +246 @@
 unset exptoenc
 
-if test -f local-setup.sh ; then
-    echo "+ Sourcing local-setup.sh"
-    . ./local-setup.sh 
+if test -f local-setup.bash ; then
+    echo "+ Sourcing local-setup.bash"
+    . ./local-setup.bash 
 fi