#11503: Make new spkg to install Jmol in SAGE_LOCAL/share
------------------------+---------------------------------------------------
Reporter: gutow | Owner: gutow
Type: task | Status: needs_work
Priority: major | Milestone: sage-4.7.1
Component: notebook | Keywords: sd31,Jmol, flask
Work_issues: | Upstream: N/A
Reviewer: | Author: gutow
Merged: | Dependencies: flask notebook
------------------------+---------------------------------------------------
Changes (by jhpalmieri):
* status: needs_review => needs_work
Comment:
I upgraded my version of mercurial so I can look at the repo, and I hope
that the version included with Sage will be upgraded soon, too (see
#10594). Oh, and now I see that I can open this repo with the old
version. Anyway, there are some uncommitted files:
{{{
$ hg status
? patches/Jmol.js.patch
? patches/jmol.patch
}}}
(So you should run "hg add" and then commit again.)
The file spkg-install needs some work. In particular, any variable which
refers to a path should be quoted, in case there are spaces in it. (Right
now, we don't support having spaces in the path where Sage is, but when
it's easy to allow, we should.) I think this should do it:
{{{
#!diff
diff --git a/spkg-install b/spkg-install
--- a/spkg-install
+++ b/spkg-install
@@ -27,12 +27,12 @@ if [ $? -ne 0 ]; then
fi
# Check for sagenb location
-cd $SAGE_ROOT"/devel/sagenb/sagenb/data/jmol"
+cd "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol"
if [ $? -ne 0 ]; 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"
+ rm -r "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol"
fi
TEMPDIR=$SPKDIR"/src"
@@ -47,15 +47,15 @@ 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"
+ rm -r "$SAGE_LOCAL/share/jmol"
echo "replacing jmol directory and contents..."
fi
-mkdir $SAGE_LOCAL"/share/jmol"
+mkdir "$SAGE_LOCAL/share/jmol"
TEMPDIR=$SPKDIR"/src/jmol"
cd "$TEMPDIR"
-cp -r * $SAGE_LOCAL"/share/jmol/"
+cp -r * "$SAGE_LOCAL/share/jmol/"
cd $SAGE_LOCAL"/bin"
if [ $? -ne 0 ]; then
@@ -64,12 +64,12 @@ if [ $? -ne 0 ]; then
else
echo "Copying jmol script to "$SAGE_LOCAL"/bin."
cd "$TEMPDIR"
- cp -f jmol $SAGE_LOCAL"/bin"
+ cp -f jmol "$SAGE_LOCAL/bin"
fi
echo "Installing applet web directory"
-mkdir $SAGE_LOCAL"/share/jmol/appletweb"
-cp Jmol.js $SAGE_LOCAL"/share/jmol/appletweb"
+mkdir "$SAGE_LOCAL/share/jmol/appletweb"
+cp Jmol.js "$SAGE_LOCAL/share/jmol/appletweb"
TEMPDIR=$SPKDIR"/patches/appletweb"
cd "$TEMPDIR"
@@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then
echo "Error finding patches/appletweb directory. Exiting."
exit 1
fi
-cp -r * $SAGE_LOCAL"/share/jmol/appletweb"
+cp -r * "$SAGE_LOCAL/share/jmol/appletweb"
if [ $? -ne 0 ]; then
echo "Error installing PACKAGE_NAME."
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11503#comment:12>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
