From 8ea66df5c9cf44a49fb3c1c025389ccdf1d20123 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Thu, 18 Jan 2007 10:30:51 +0000 Subject: [PATCH] fixed #2116; needs testing --- campcaster/bin/postInstallStation.sh | 8 ++++++++ .../var/install/upgrade/upgrade-to-1.2.0.php | 8 ++++---- .../modules/storageServer/var/install/upgrade/upgrade.php | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) create mode 120000 campcaster/src/modules/storageServer/var/install/upgrade/upgrade.php diff --git a/campcaster/bin/postInstallStation.sh b/campcaster/bin/postInstallStation.sh index 9023d6c63..9ff9e1e2d 100755 --- a/campcaster/bin/postInstallStation.sh +++ b/campcaster/bin/postInstallStation.sh @@ -443,6 +443,14 @@ if [ "$storage_is_local" = "yes" ]; then fi +#------------------------------------------------------------------------------- +# Update the database, if necessary +#------------------------------------------------------------------------------- +if [ "$storage_is_local" = "yes" ]; then + php -q $install_var_ls/storageServer/var/install/upgrade/upgrade.php +fi + + #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- diff --git a/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php index c2215f530..cc69093bc 100644 --- a/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php +++ b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php @@ -26,9 +26,9 @@ echo "**********************************\n"; echo "* StorageServer Upgrade to 1.2.0 *\n"; echo "**********************************\n"; -require_once('../../conf.php'); -require_once("../installInit.php"); -require_once("../../StoredFile.php"); +require_once(dirname(__FILE__).'/../../conf.php'); +require_once(dirname(__FILE__)."/../installInit.php"); +require_once(dirname(__FILE__)."/../../StoredFile.php"); // Check to see if upgrade has already been applied $sql = "SELECT md5 FROM ".$CC_CONFIG['filesTable']." LIMIT 1"; @@ -80,4 +80,4 @@ echo "*******************************************\n"; echo "* StorageServer Upgrade to 1.2.0 Complete *\n"; echo "*******************************************\n"; -?> \ No newline at end of file +?> diff --git a/campcaster/src/modules/storageServer/var/install/upgrade/upgrade.php b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade.php new file mode 120000 index 000000000..1c42eb52c --- /dev/null +++ b/campcaster/src/modules/storageServer/var/install/upgrade/upgrade.php @@ -0,0 +1 @@ +upgrade-to-1.2.0.php \ No newline at end of file