Initial change to create appropriate user directory.

install/bin/dbexport

@@ -6,4 +6,5 @@
 # options:
 #		-i               Export from 'installed' database (default is edit db)
 #
-%INSTALL_PATH/bin/decj decodes.dbimport.DbExport $*
+APP_PATH=$( dirname -- "${BASH_SOURCE[0]}")
+${APP_PATH}/decj decodes.dbimport.DbExport $*

install/bin/decj

@@ -6,7 +6,8 @@
 #
 
 # INSTALL_PATH will be replaced with actual DECODES install dir.
-DH=%INSTALL_PATH
+APP_PATH=$( dirname -- "${BASH_SOURCE[0]}")
+DH="${APP_PATH}/.."
 
 # Make sure DCSTOOL_HOME is set
 if [ -z "$DCSTOOL_HOME" ]

install/bin/decj.bat

@@ -21,4 +21,18 @@ for /R "%APP_PATH%/dep" %%a in (*.jar) do (
 
 set "CLASSPATH=!CLASSPATH!"
 
-java -Xmx240m -cp "!CLASSPATH!" -DDCSTOOL_HOME="%APP_PATH%" -DDECODES_INSTALL_DIR="%APP_PATH%" -DDCSTOOL_USERDIR="%APP_PATH%" %*%
+if not defined DCSTOOL_USERDIR (
+  set DCSTOOL_USERDIR="%APPDATA%\opendcs"
+)
+
+if not exist %DCSTOOL_USERDIR%\ (
+  echo "Creating Local User Directory and initial properties in %DCSTOOL_USERDIR%"
+  mkdir %DCSTOOL_USERDIR%
+  cp %APP_PATH%\decodes.properties %DCSTOOL_USERDIR%\user.properties
+)
+
+for /R "%DCSTOOL_USERDIR%/dep" %%a in (*.jar) do (
+  set "CLASSPATH=!CLASSPATH!;%%a"
+  )
+
+java -Xmx240m -cp "!CLASSPATH!" -DDCSTOOL_HOME="%APP_PATH%" -DDECODES_INSTALL_DIR="%APP_PATH%" -DDCSTOOL_USERDIR="%DCSTOOL_USERDIR%" %*%

install/bin/launcher_start

@@ -1,2 +1,3 @@
 #!/bin/sh
-%INSTALL_PATH/bin/decj decodes.launcher.LauncherFrame $*
+APP_PATH=$( dirname -- "${BASH_SOURCE[0]}")
+${APP_PATH}/decj decodes.launcher.LauncherFrame $*

install/decodes.properties

@@ -3,7 +3,7 @@
 # The default installation is set up for a local XML database.
 #
 EditDatabaseType=XML
-EditDatabaseLocation=$DECODES_INSTALL_DIR/edit-db
+EditDatabaseLocation=$DCSTOOL_USERDIR/edit-db
 
 #
 # For SQL Editable Database, change EditDatabaseType to sql