Skip to content

Commit 5141120

Browse files
francescobiancofrancescobianco
committed
first commit #5 
1 parent db18e73 commit 5141120

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+250
-275
lines changed

‎5.1.0/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.1.0/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.2.0-RC/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.2.0-RC/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.2.0-VB1/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.2.0-VB1/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.2.0-VB2/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.2.0-VB2/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.2.0/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.2.0/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.2.1/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.2.1/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

‎5.3.0-RC/vtiger-functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function __realpath__($path, $link = null)
1212
if ($link) {
1313
$head = trim(substr($path, strlen($link)), '/');
1414
$base = basename($link);
15-
$real = __realpath(dirname($link));
15+
$real = __realpath__(dirname($link));
1616

1717
return $real.'/'.$base.'/'.$head;
1818
}
@@ -23,7 +23,7 @@ function __realpath__($path, $link = null)
2323
}
2424

2525
if ($link != '.' && $link != '/') {
26-
return __realpath($path, $link);
26+
return __realpath__($path, $link);
2727
}
2828

2929
return realpath($path);

‎5.3.0-RC/vtiger-install.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ fi
3838
## Assert MySQL
3939
if [[ $@ == *'--assert-mysql'* ]]; then
4040
service mysql start
41-
## Check if database exists
42-
ASSERT_DB=`mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger`
43-
if [[ "$ASSERT_DB" != "vtiger" ]]; then
41+
database=$(mysqlshow -uvtiger -pvtiger -hlocalhost vtiger | grep -v Wildcard | grep -o vtiger)
42+
if [[ "${database}" != "vtiger" ]]; then
4443
echo "[vtiger] install error '--install-mysql' database not found.";
4544
exit 65;
4645
fi
@@ -49,19 +48,19 @@ fi
4948
## Execute Wizard
5049
mkdir -p /var/lib/vtiger/logs
5150
service apache2 start
52-
## Check if apache and vtiger are ready
53-
ASSERT_VT=`curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n"`
54-
if [[ "$ASSERT_VT" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
51+
response=$(curl -Is "http://localhost/index.php?module=Install&view=Index" | head -n 1 | tr -d "\r\n")
52+
if [[ "${response}" != "HTTP/1.1 200 OK" ]]; then exit 64; fi
5553
php /usr/src/vtiger/vtiger-install.php
5654
if [[ $? -ne 0 ]]; then exit 66; fi
5755

5856
## Export fresh database
5957
if [[ $@ == *'--dump'* ]]; then
60-
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > vtiger.sql
61-
if [[ ! `find vtiger.sql -type f -size +200k 2>/dev/null` ]]; then
58+
sql_file=/usr/src/vtiger/vtiger.sql
59+
mysqldump -uvtiger -pvtiger -h127.0.0.1 vtiger > "${sql_file}"
60+
if [[ ! $(find "${sql_file}" -type f -size +200k 2>/dev/null) ]]; then
6261
echo "[vtiger] dump error database sql too small"
6362
echo "---(vtiger.sql START)----"
64-
cat vtiger.sql
63+
cat "${sql_file}"
6564
echo "---(vtiger.sql END)----"
6665
exit 67;
6766
fi

0 commit comments

Comments
 (0)