diff --git a/Rocksolid_Light/common/config.inc.php b/Rocksolid_Light/common/config.inc.php index 6c6fe99..98e6dbc 100644 --- a/Rocksolid_Light/common/config.inc.php +++ b/Rocksolid_Light/common/config.inc.php @@ -1,11 +1,11 @@ "; /* Location of configuration and spool */ -$config_dir = "/etc/rslight/"; -$spooldir = "/var/spool/rslight/"; +$config_dir = ""; +$spooldir = ""; if(isset($config_name) && file_exists($config_dir.$config_name.'.inc.php')) { $config_file = $config_dir.$config_name.'.inc.php'; diff --git a/Rocksolid_Light/debian-install.sh b/Rocksolid_Light/debian-install.sh index 2748575..e693399 100755 --- a/Rocksolid_Light/debian-install.sh +++ b/Rocksolid_Light/debian-install.sh @@ -1,5 +1,6 @@ #!/bin/bash +read -r version < "./version.txt" webroot="/var/www/html" spoolpath="/var/spool/rslight" configpath="/etc/rslight" @@ -102,6 +103,7 @@ echo "done" echo echo -n "Applying configuration..." +sed -i '' -e "s||$version|" $webroot/common/config.inc.php sed -i '' -e "s||$spoolpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$configpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$username|" $configpath/rslight.inc.php diff --git a/Rocksolid_Light/debian-upgrade.sh b/Rocksolid_Light/debian-upgrade.sh index c380ef4..1ed9507 100755 --- a/Rocksolid_Light/debian-upgrade.sh +++ b/Rocksolid_Light/debian-upgrade.sh @@ -1,5 +1,6 @@ #!/bin/bash +read -r version < "./version.txt" webroot="/var/www/html" spoolpath="/var/spool/rslight" configpath="/etc/rslight" @@ -102,6 +103,7 @@ echo "done" echo echo -n "Applying configuration..." +sed -i '' -e "s||$version|" $webroot/common/config.inc.php sed -i '' -e "s||$spoolpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$configpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$username|" $configpath/upgrade/rslight.inc.php diff --git a/Rocksolid_Light/freebsd-install.sh b/Rocksolid_Light/freebsd-install.sh index c40772f..8d6ae58 100755 --- a/Rocksolid_Light/freebsd-install.sh +++ b/Rocksolid_Light/freebsd-install.sh @@ -1,5 +1,6 @@ #!/usr/local/bin/bash +read -r version < "./version.txt" webroot="/usr/local/www/html" spoolpath="/var/spool/rslight" configpath="/etc/rslight" @@ -101,6 +102,7 @@ echo "done" echo echo -n "Applying configuration..." +sed -i '' -e "s||$version|" $webroot/common/config.inc.php sed -i '' -e "s||$spoolpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$configpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$username|" $configpath/rslight.inc.php diff --git a/Rocksolid_Light/freebsd-upgrade.sh b/Rocksolid_Light/freebsd-upgrade.sh index 032e80d..462f31b 100755 --- a/Rocksolid_Light/freebsd-upgrade.sh +++ b/Rocksolid_Light/freebsd-upgrade.sh @@ -1,5 +1,6 @@ #!/usr/local/bin/bash +read -r version < "./version.txt" webroot="/usr/local/www/html" spoolpath="/var/spool/rslight" configpath="/etc/rslight" @@ -102,6 +103,7 @@ echo "done" echo echo -n "Applying configuration..." +sed -i '' -e "s||$version|" $webroot/common/config.inc.php sed -i '' -e "s||$spoolpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$configpath/|" $webroot/common/config.inc.php sed -i '' -e "s||$username|" $configpath/upgrade/rslight.inc.php diff --git a/Rocksolid_Light/version.txt b/Rocksolid_Light/version.txt new file mode 100644 index 0000000..7486fdb --- /dev/null +++ b/Rocksolid_Light/version.txt @@ -0,0 +1 @@ +0.7.2