From 6ec5a40c82179a1aec566ac1d3051dd18cc86087 Mon Sep 17 00:00:00 2001 From: Brian Quinion Date: Wed, 3 Apr 2013 17:03:39 +0100 Subject: [PATCH 1/1] better osmosis error message --- utils/setup.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/setup.php b/utils/setup.php index 5ec22dd0..3f2e6d05 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -495,14 +495,17 @@ $bDidSomething = true; $oDB =& getDB(); - if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis"); + if (!file_exists(CONST_Osmosis_Binary)) + { + echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n"; + fail("osmosis not found in '".CONST_Osmosis_Binary."'"); + } if (file_exists(CONST_BasePath.'/settings/configuration.txt')) { echo "settings/configuration.txt already exists\n"; } else { - passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings'); // update osmosis configuration.txt with our settings passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt'); -- 2.39.5