Merge branch 'devel'

This commit is contained in:
Retro_Guy 2024-05-30 02:27:10 -07:00
commit c0a7f8584b
5 changed files with 2 additions and 6 deletions

View File

@ -1,7 +1,7 @@
<?php
/* Version */
$rslight_version = "<version>";
$rslight_version = file_get_contents('../common/version.txt');
/* Location of configuration and spool */
$config_dir = "<config_dir>";

View File

@ -0,0 +1 @@
0.9.9

View File

@ -1,6 +1,5 @@
#!/bin/bash
read -r version < "./version.txt"
webroot="/var/www/html"
spoolpath="/var/spool/rslight"
configpath="/etc/rslight"
@ -103,7 +102,6 @@ echo "done"
echo
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|<config_dir>|$configpath/|" $webroot/common/config.inc.php
sed -i -e "s|<webserver_user>|$username|" $configpath/rslight.inc.php

View File

@ -1,6 +1,5 @@
#!/bin/bash
read -r version < "./version.txt"
webroot="/var/www/html"
spoolpath="/var/spool/rslight"
configpath="/etc/rslight"
@ -97,7 +96,6 @@ echo "done"
echo
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|<config_dir>|$configpath/|" $webroot/common/config.inc.php
sed -i -e "s|<webserver_user>|$username|" $configpath/upgrade/rslight.inc.php

View File

@ -1 +0,0 @@
0.9.875