CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-move locale check to beginning of install script
This commit is contained in:
parent
9d672ab374
commit
7d691a44af
install_minimal
|
@ -105,6 +105,17 @@ if [ "$LSOF_EXIST" != "0" -o "$SUDO_EXIST" != "0" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
echo "* Making sure /etc/default/locale is set properly"
|
||||
set +e
|
||||
update-locale
|
||||
cat /etc/default/locale | grep -i "LANG=.*UTF-\?8"
|
||||
set -e
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "non UTF-8 default locale found in /etc/default/locale."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
# Check if airtime exists already
|
||||
set +e
|
||||
php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-installed-check.php
|
||||
|
@ -185,16 +196,6 @@ if [ "$DO_UPGRADE" -eq "0" ]; then
|
|||
fi
|
||||
set -e
|
||||
|
||||
echo "* Making sure /etc/default/locale is set properly"
|
||||
set +e
|
||||
update-locale
|
||||
cat /etc/default/locale | grep -i "LANG=.*UTF-\?8"
|
||||
set -e
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "non UTF-8 default locale found in /etc/default/locale."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
$SCRIPTPATH/include/airtime-copy-files.sh
|
||||
$SCRIPTPATH/include/airtime-initialize.sh $@
|
||||
|
||||
|
|
Loading…
Reference in New Issue