From 8bf2348947da1405591d503cde56c96965c9a514 Mon Sep 17 00:00:00 2001 From: Richard Neese Date: Tue, 7 Feb 2017 16:52:44 -0600 Subject: [PATCH] fixing debian pkg installs (#2363) --- app/scripts/resources/classes/scripts.php | 4 ++-- core/install/resources/classes/install_fusionpbx.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index e18a15554c..a492f45e01 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -100,8 +100,8 @@ if (!class_exists('scripts')) { } if (file_exists($dst_dir)) { //get the source directory - if (file_exists('/usr/share/examples/fusionpbx/resources/install/scripts')){ - $src_dir = '/usr/share/examples/fusionpbx/resources/install/scripts'; + if (file_exists('/usr/share/examples/fusionpbx/scripts')){ + $src_dir = '/usr/share/examples/fusionpbx/scripts'; } else { $src_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts'; diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php index 92ac0e2e89..3563ba4396 100644 --- a/core/install/resources/classes/install_fusionpbx.php +++ b/core/install/resources/classes/install_fusionpbx.php @@ -292,8 +292,8 @@ include "root.php"; $schema->exec(); //get the contents of the sql file - if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql')){ - $filename = "/usr/share/examples/fusionpbx/resources/install/sql/sqlite.sql"; + if (file_exists('/usr/share/examples/fusionpbx/sql/sqlite.sql')){ + $filename = "/usr/share/examples/fusionpbx/sql/sqlite.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/sqlite.sql'; @@ -387,8 +387,8 @@ include "root.php"; $schema->exec(); //get the contents of the sql file - if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql')){ - $filename = "/usr/share/examples/fusionpbx/resources/install/sql/pgsql.sql"; + if (file_exists('/usr/share/examples/fusionpbx/sql/pgsql.sql')){ + $filename = "/usr/share/examples/fusionpbx/sql/pgsql.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/pgsql.sql'; @@ -558,8 +558,8 @@ include "root.php"; //add the defaults data into the database //get the contents of the sql file - if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql')){ - $filename = "/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql"; + if (file_exists('/usr/share/examples/fusionpbx/sql/mysql.sql')){ + $filename = "/usr/share/examples/fusionpbx/sql/mysql.sql"; } else { $filename = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/sql/mysql.sql';