Ticket #11503: trac11503.patch

SPKG.txt

@@ -1 +1 @@
 = Jmol for Sage =
-Version 12.0.45.p2 - July 18, 2011 - added patched launch script jmol to spkg 
-     repository.  
 
 == Description ==
 
@@ -31 +29 @@
     compatible.
     
 == Change Log ==
+Version 12.0.45.p3 - January 11, 2012 - improvements to spkg-install.
 Version 12.0.45.p2 - July 18, 2011 - added patched launch script jmol to spkg 
      repository.  
 Version 12.0.45.p1 - June 24, 2011 - added signed applet to spkg and patched

spkg-install

@@ -5 +5 @@
    exit 1
 fi
 
-SPKDIR=`pwd`
-echo "Temporary package directory: "$SPKDIR
+SPKGDIR=`pwd`
+echo "Temporary package directory: $SPKGDIR"
 
 # Patches.  Comment out this section if there are none.
-TEMPDIR="$SPKDIR/patches"
-cd "$TEMPDIR"
-if [ $? -ne 0 ]; then
+if [ ! -d "$SPKGDIR"/patches ]; then
    echo "Error finding patches directory. Exiting."
    exit 1
 fi
-cp Jmol.js ../src/jmol
+
+cp "$SPKGDIR"/patches/Jmol.js "$SPKGDIR"/src/jmol/
 if [ $? -ne 0 ]; then
    echo "Error copying Jmol.js patch. Exiting."
    exit 1
-fi 
-cp jmol ../src/jmol
+fi
+
+cp "$SPKGDIR"/patches/jmol "$SPKGDIR"/src/jmol/
 if [ $? -ne 0 ]; then
    echo "Error copying jmol script patch. Exiting."
    exit 1
 fi
 
 # Check for sagenb location
-cd "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol"
-if [ $? -ne 0 ]; then
+if [ ! -d "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol" ]; then
     echo "No old Jmol install in notebook. Skipping removal of Jmol from notebook."
 else
     echo "Removing Jmol files from the notebook data directory..."
     rm -r "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol"
 fi
 
-TEMPDIR="$SPKDIR/src"
-cd "$TEMPDIR"
-if [ $? -ne 0 ]; then
-   echo "Error finding src directory. Exiting."
-   exit 1
+if [ ! -d "$SAGE_LOCAL"/share/jmol ]; then
+    echo "Directory "$SAGE_LOCAL"/share/jmol does not exist.  Creating directory..."
+    mkdir "$SAGE_LOCAL/share/jmol"
+else
+    echo "Deleting all files from "$SAGE_LOCAL"/share/jmol/..."
+    rm -r "$SAGE_LOCAL"/share/jmol/*
+    echo "Replacing jmol directory and contents..."
 fi
 
-cd "$SAGE_LOCAL/share/jmol"
-if [ $? -ne 0 ]; then
-   echo "Directory "$SAGE_LOCAL"/share/jmol does not exist.  Creating Directory..."
-else
-    echo "Deleting all files from "$SAGE_LOCAL"/share/jmol..."
-    rm -r "$SAGE_LOCAL/share/jmol"
-    echo "replacing jmol directory and contents..."
-fi
+# "install" the Jmol files...
+cp -r "$SPKGDIR"/src/jmol/* "$SAGE_LOCAL"/share/jmol/
 
-mkdir "$SAGE_LOCAL/share/jmol"
-
-TEMPDIR="$SPKDIR/src/jmol"
-cd "$TEMPDIR"
-cp -r * "$SAGE_LOCAL/share/jmol/"
-
-cd "$SAGE_LOCAL/bin"
-if [ $? -ne 0 ]; then
+if [ ! -d "$SAGE_LOCAL"/bin ]; then
    echo "Directory "$SAGE_LOCAL"/bin does not exist.  Your Sage install is broken. Exiting."
    exit 1
 else
-    echo "Copying jmol script to "$SAGE_LOCAL"/bin."
-    cd "$TEMPDIR"
-    cp -f jmol "$SAGE_LOCAL/bin"
+    echo "Copying jmol script to $SAGE_LOCAL/bin."
+    cp -f "$SPKGDIR"/src/jmol/jmol "$SAGE_LOCAL"/bin/
 fi
 
 echo "Installing applet web directory"
 mkdir "$SAGE_LOCAL/share/jmol/appletweb"
-cp Jmol.js "$SAGE_LOCAL/share/jmol/appletweb"
+cp "$SPKGDIR"/src/jmol/Jmol.js "$SAGE_LOCAL/share/jmol/appletweb"
 
-TEMPDIR="$SPKDIR/patches/appletweb"
-cd "$TEMPDIR"
-if [ $? -ne 0 ]; then
+if [ ! -d "$SPKGDIR"/patches/appletweb ]; then
    echo "Error finding patches/appletweb directory. Exiting."
    exit 1
 fi
-cp -r * "$SAGE_LOCAL/share/jmol/appletweb"
+cp -r "$SPKGDIR"/patches/appletweb/* "$SAGE_LOCAL"/share/jmol/appletweb
+
 
 if [ $? -ne 0 ]; then
-   echo "Error installing PACKAGE_NAME."
+   echo "Error installing Jmol."
    exit 1
 else
-    echo "New Jmol installed successfully."
+   echo "New Jmol installed successfully."
 fi