Merge branch 'devel'
This commit is contained in:
commit
c0a7f8584b
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/* Version */
|
/* Version */
|
||||||
$rslight_version = "<version>";
|
$rslight_version = file_get_contents('../common/version.txt');
|
||||||
|
|
||||||
/* Location of configuration and spool */
|
/* Location of configuration and spool */
|
||||||
$config_dir = "<config_dir>";
|
$config_dir = "<config_dir>";
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
0.9.9
|
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
read -r version < "./version.txt"
|
|
||||||
webroot="/var/www/html"
|
webroot="/var/www/html"
|
||||||
spoolpath="/var/spool/rslight"
|
spoolpath="/var/spool/rslight"
|
||||||
configpath="/etc/rslight"
|
configpath="/etc/rslight"
|
||||||
|
@ -103,7 +102,6 @@ echo "done"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo -n "Applying configuration..."
|
echo -n "Applying configuration..."
|
||||||
sed -i -e "s|<version>|$version|" $webroot/common/config.inc.php
|
|
||||||
sed -i -e "s|<spooldir>|$spoolpath/|" $webroot/common/config.inc.php
|
sed -i -e "s|<spooldir>|$spoolpath/|" $webroot/common/config.inc.php
|
||||||
sed -i -e "s|<config_dir>|$configpath/|" $webroot/common/config.inc.php
|
sed -i -e "s|<config_dir>|$configpath/|" $webroot/common/config.inc.php
|
||||||
sed -i -e "s|<webserver_user>|$username|" $configpath/rslight.inc.php
|
sed -i -e "s|<webserver_user>|$username|" $configpath/rslight.inc.php
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
read -r version < "./version.txt"
|
|
||||||
webroot="/var/www/html"
|
webroot="/var/www/html"
|
||||||
spoolpath="/var/spool/rslight"
|
spoolpath="/var/spool/rslight"
|
||||||
configpath="/etc/rslight"
|
configpath="/etc/rslight"
|
||||||
|
@ -97,7 +96,6 @@ echo "done"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo -n "Applying configuration..."
|
echo -n "Applying configuration..."
|
||||||
sed -i -e "s|<version>|$version|" $webroot/common/config.inc.php
|
|
||||||
sed -i -e "s|<spooldir>|$spoolpath/|" $webroot/common/config.inc.php
|
sed -i -e "s|<spooldir>|$spoolpath/|" $webroot/common/config.inc.php
|
||||||
sed -i -e "s|<config_dir>|$configpath/|" $webroot/common/config.inc.php
|
sed -i -e "s|<config_dir>|$configpath/|" $webroot/common/config.inc.php
|
||||||
sed -i -e "s|<webserver_user>|$username|" $configpath/upgrade/rslight.inc.php
|
sed -i -e "s|<webserver_user>|$username|" $configpath/upgrade/rslight.inc.php
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
0.9.875
|
|
Loading…
Reference in New Issue