@@ -320,14 +320,14 @@ elif [ ! -f /etc/debian_version ]; then # Default is Debian
320
320
echoerr " Support for this platform ($OS_DIST_INFO ) is limited... use at your own risk..."
321
321
322
322
# Try to automatically detect the right package manager, at least...
323
- if ! which " yum" > /dev/null; then
323
+ if which " yum" > /dev/null; then
324
324
PAC_MAN=" yum"
325
- elif ! which " dnf" > /dev/null; then
325
+ elif which " dnf" > /dev/null; then
326
326
PAC_MAN=" dnf"
327
- elif ! which " pkg" > /dev/null; then
327
+ elif which " pkg" > /dev/null; then
328
328
PAC_MAN=" pkg"
329
329
AST_SOURCE_PARENT_DIR=" /usr/local/src"
330
- elif which " apt-get" > /dev/null; then # apt-get is default, so check last
330
+ elif ! which " apt-get" > /dev/null; then # apt-get is default, so check last
331
331
echoerr " Failed to automatically determine your package manager... script will likely fail"
332
332
fi
333
333
fi
@@ -2405,7 +2405,7 @@ install_odbc() {
2405
2405
# https://wiki.asterisk.org/wiki/display/AST/Getting+Asterisk+Connected+to+MySQL+via+ODBC
2406
2406
if [ " $PAC_MAN " = " apt-get" ]; then
2407
2407
# unixodbc is what contains isql
2408
- apt-get install -y unixodbc unixodbc-dev unixodbc-bin mariadb-server odbcinst
2408
+ install_package " unixodbc unixodbc-dev odbcinst"
2409
2409
fi
2410
2410
cd $AST_SOURCE_PARENT_DIR
2411
2411
# http://www.unixodbc.org/ to get isql (if desired for manual testing)
@@ -2423,8 +2423,8 @@ install_odbc() {
2423
2423
fi
2424
2424
cp libmaodbc.so /usr/lib/x86_64-linux-gnu/odbc/
2425
2425
cp libmariadb.so /usr/lib/x86_64-linux-gnu/odbc/
2426
- rm mariadb-connector-odbc-$ODBC_VER -debian-buster-amd64.tar.gz
2427
2426
cd $AST_SOURCE_PARENT_DIR
2427
+ rm mariadb-connector-odbc-$ODBC_VER -debian-buster-amd64.tar.gz
2428
2428
odbcinst -j
2429
2429
if [ $? -ne 0 ]; then
2430
2430
die " odbcinst failed"
0 commit comments