DFHack 0.47.05-r7 +updated launch scripts

1 files changed, 8 insertions, 17 deletions

diff --git a/dfhack-run.sh b/dfhack-run.sh
index 7355a7d58f42..a4e3e1f730b3 100644
--- a/dfhack-run.sh
+++ b/dfhack-run.sh
@@ -2,27 +2,18 @@
 
 # check for dwarffortress user directory
 if [[ ! -d ~/.dwarffortress ]] ; then
-  mkdir -p ~/.dwarffortress/data
-
-  ln -s  /opt/dwarffortress/raw       ~/.dwarffortress/raw
-  ln -s  /opt/dwarffortress/libs      ~/.dwarffortress/libs
-  cp -rn /opt/dwarffortress/data/init ~/.dwarffortress/data/init
-
-  for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech ; do
-    cp -r /opt/dwarffortress/data/$link ~/.dwarffortress/data/$link
-  done
+	echo "Error: dfhack-run passes commands to a running instance of\
+ DFHack, but ~/.dwarffortress/ does not exist and should have been\
+ created when dfhack was run" >&2
+ 	exit 1
 fi
 
 # check for dfhack user directory
 if [[ ! -d ~/.dwarffortress/hack ]] ; then
-  ln -s /opt/dwarffortress/hack                ~/.dwarffortress/hack
-  ln -s /opt/dwarffortress/stonesense          ~/.dwarffortress/stonesense
-  ln -s /opt/dwarffortress/dfhack              ~/.dwarffortress/dfhack
-  ln -s /opt/dwarffortress/dfhack-run          ~/.dwarffortress/dfhack-run
-  ln -s /opt/dwarffortress/dfhack.init-example ~/.dwarffortress/dfhack.init-example
-  cp -r /opt/dwarffortress/dfhack-config       ~/.dwarffortress/dfhack-config
-
-  cp ~/.dwarffortress/dfhack.init{-example,}
+	echo "Error: dfhack-run passes commands to a running instance of\
+ DFHack, but ~/.dwarffortress/hack/ does not exist and should have been\
+ created when dfhack was run" >&2
+ 	exit 1
 fi
 
 # workaround for bug in Debian/Ubuntu SDL patch