Merge pull request #407 from klightspeed/1.5#defaultinstance

Make "main" instance default in new installs
This commit is contained in:
Fez Vrasta 2016-02-17 17:33:29 +01:00
commit acd936d41f
2 changed files with 3 additions and 1 deletions

View File

@ -69,4 +69,4 @@ mod_branch=Windows
# example for config name "ark1":
#configfile_ark1="/path/to/config/file"
#defaultinstance="main"
defaultinstance="main"

View File

@ -189,6 +189,7 @@ if [ "$userinstall" == "yes" ]; then
exit 2
else
mv -n "${INSTALL_ROOT}${CONFIGFILE}.NEW" "${INSTALL_ROOT}${CONFIGFILE}"
cp -n "${INSTALL_ROOT}/${INSTANCEDIR}/instance.cfg.example" "${INSTALL_ROOT}/${INSTANCEDIR}/main.cfg"
fi
else
# Copy arkmanager to /usr/bin and set permissions
@ -318,6 +319,7 @@ else
exit 2
else
mv -n "${INSTALL_ROOT}${CONFIGFILE}.NEW" "${INSTALL_ROOT}${CONFIGFILE}.cfg"
cp -n "${INSTALL_ROOT}/${INSTANCEDIR}/instance.cfg.example" "${INSTALL_ROOT}/${INSTANCEDIR}/main.cfg"
fi
fi