# HG changeset patch
# User samer
# Date 1422033197 0
# Node ID ef88a4afac7a019ca4747c02caa839e096a8551e
# Parent  0dcb52a3722e8fa5dc19a3eedb2ef46a3202077a# Parent  2059c4f64feb313f9841fafb9df31e0ff87eb923
merging.

diff -r 2059c4f64feb -r ef88a4afac7a .screenrc
--- a/.screenrc	Mon Jan 19 14:38:58 2015 +0000
+++ b/.screenrc	Fri Jan 23 17:13:17 2015 +0000
@@ -22,5 +22,5 @@
 bind _ resize max
 
 screen -t dml-edit 1 runin $HOME/var/dml  bash
-screen -t dml-run 0 forever $HOME/var/dml ./run.pl
+screen -t dml-run 0 runin $HOME/var/dml forever ./run.pl
 
diff -r 2059c4f64feb -r ef88a4afac7a etc/setup_as_dml.sh
--- a/etc/setup_as_dml.sh	Mon Jan 19 14:38:58 2015 +0000
+++ b/etc/setup_as_dml.sh	Fri Jan 23 17:13:17 2015 +0000
@@ -5,6 +5,12 @@
 SS_USER=<DML_USER_NAME HERE>
 MAKE_HUMDRUM=yes
 
+if [ -x matlab ]; then
+	HAVE_MATLAB=yes
+else
+	HAVE_MATLAB=no
+fi
+
 # ------------------ END OF CONFIG ---------
 
 function install_swi {
@@ -66,6 +72,13 @@
 	install_swi
 fi
 
+if [ $INSTALL_SWI_PACKS == yes ]; then
+	swipl -g 'maplist(pack_install,[lambda,prosqlite,memo,callgraph,swipe,sparkle,musicbrainz,plsmf,plumdrum,sindice]), halt'
+	if [ $HAVE_MATLAB == yes ]; then
+		swipl -g 'pack_install(plml), halt'
+	end
+fi
+
 # DOWNLOADS FROM REPOs
 get_repo_into ~/src/github git https://github.com/samer--/ClioPatria
 cd ~/src/github/ClioPatria && git checkout dml
@@ -77,10 +90,8 @@
 get_repo_into ~/src/hg hg https://code.soundsoftware.ac.uk/hg/dml-cliopatria
 get_repo_into ~/src/hg hg https://code.soundsoftware.ac.uk/hg/ishara
 get_repo_into ~/src/hg hg https://code.soundsoftware.ac.uk/hg/kernscores-utf8
+get_repo_into ~/src/hg hg https://code.soundsoftware.ac.uk/hg/dml-datasets
 
-unpack_into ~/lib  https://code.soundsoftware.ac.uk/attachments/download/1281/lib-swipl.tar.gz
-unpack_into ~/var/dml https://code.soundsoftware.ac.uk/attachments/download/1282/var-dml-cpack.tar.gz
 cp_into ~/lib/beets https://code.soundsoftware.ac.uk/attachments/download/1284/music-ro.db
-cp_into ~/lib/mets https://code.soundsoftware.ac.uk/attachments/download/1283/DML_metadata_batch_01.tar.gz
 
 mkdir -p ~/var/dml/memo_db
diff -r 2059c4f64feb -r ef88a4afac7a lib/charm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/charm	Fri Jan 23 17:13:17 2015 +0000
@@ -0,0 +1,1 @@
+/home/dml/src/hg/dml-datasets/CHARM
\ No newline at end of file
diff -r 2059c4f64feb -r ef88a4afac7a lib/mets
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/mets	Fri Jan 23 17:13:17 2015 +0000
@@ -0,0 +1,1 @@
+/home/dml/src/hg/dml-datasets/BL
\ No newline at end of file