smeserver-freepbx/contribs9/smeserver-freepbx-0.1-Sme9Ast13Fpbx13-1.patch

diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall
--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall      2016-05-15 03:05:48.955000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall  2016-05-15 03:38:40.023000000 -0400
@@ -11,10 +11,10 @@
         mysql -e "grant all privileges on $DBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
         mysql -e 'flush privileges;'
 
-        if [ -e /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql ]; then
-                mysql $DBNAME < /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql
+        if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
+                mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
         else
-                echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql dosen't exists"
+                echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
                 exit 1
         fi
 fi
@@ -23,10 +23,10 @@
         mysql -e "create database $CDRDBNAME;"
         mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
         mysql -e 'flush privileges;'
-        if [ -e /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql ]; then
-                mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql
+        if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
+                mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
         else
-                echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
+                echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
                 exit 1
         fi
 fi
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database   2016-05-15 03:05:48.939000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database       2016-05-15 03:15:39.198000000 -0400
@@ -12,20 +12,20 @@
 if [ ! -d /var/lib/mysql/$dbname ]; then
     mysqladmin create $dbname
 
-    if [ -e /usr/lib/freepbx/SQL/newinstall.sql ]; then
-        mysql $dbname < /usr/lib/freepbx/SQL/newinstall.sql
+    if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
+        mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
     else
-        echo "Error: file /usr/lib/freepbx/SQL/newinstall.sql dosen't exists"
+        echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
         exit 1
     fi
 fi
 
 if [ ! -d /var/lib/mysql/$cdrdbname ]; then
     mysqladmin create $cdrdbname
-    if [ -e /usr/lib/freepbx/SQL/cdr_mysql_table.sql ]; then
-        mysql $cdrdbname < /usr/lib/freepbx/SQL/cdr_mysql_table.sql
+    if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
+        mysql $cdrdbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
     else
-        echo "Error: file /usr/lib/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
+        echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
         exit 1
     fi
 fi
1	unnilennium	1.1	diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall
2			--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-15 03:05:48.955000000 -0400
3			+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-15 03:38:40.023000000 -0400
4			@@ -11,10 +11,10 @@
5			mysql -e "grant all privileges on $DBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
6			mysql -e 'flush privileges;'
7
8			- if [ -e /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql ]; then
9			- mysql $DBNAME < /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql
10			+ if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
11			+ mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
12			else
13			- echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql dosen't exists"
14			+ echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
15			exit 1
16			fi
17			fi
18			@@ -23,10 +23,10 @@
19			mysql -e "create database $CDRDBNAME;"
20			mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
21			mysql -e 'flush privileges;'
22			- if [ -e /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql ]; then
23			- mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql
24			+ if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
25			+ mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
26			else
27			- echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
28			+ echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
29			exit 1
30			fi
31			fi
32			diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database
33			--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-15 03:05:48.939000000 -0400
34			+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-15 03:15:39.198000000 -0400
35			@@ -12,20 +12,20 @@
36			if [ ! -d /var/lib/mysql/$dbname ]; then
37			mysqladmin create $dbname
38
39			- if [ -e /usr/lib/freepbx/SQL/newinstall.sql ]; then
40			- mysql $dbname < /usr/lib/freepbx/SQL/newinstall.sql
41			+ if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
42			+ mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
43			else
44			- echo "Error: file /usr/lib/freepbx/SQL/newinstall.sql dosen't exists"
45			+ echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
46			exit 1
47			fi
48			fi
49
50			if [ ! -d /var/lib/mysql/$cdrdbname ]; then
51			mysqladmin create $cdrdbname
52			- if [ -e /usr/lib/freepbx/SQL/cdr_mysql_table.sql ]; then
53			- mysql $cdrdbname < /usr/lib/freepbx/SQL/cdr_mysql_table.sql
54			+ if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
55			+ mysql $cdrdbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
56			else
57			- echo "Error: file /usr/lib/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
58			+ echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
59			exit 1
60			fi
61			fi