Bugfix: Don't list the stor directory in the uninstaller warning message

This commit is contained in:
Albert Santoni 2015-04-07 18:56:22 -04:00
parent e618861737
commit 70e812d888
1 changed files with 2 additions and 3 deletions

View File

@ -49,7 +49,6 @@ AIRTIMEROOT=${SCRIPT_DIR}
STOR_DIR=$(getStorDirFromDatabase) STOR_DIR=$(getStorDirFromDatabase)
FILES=( FILES=(
"${STOR_DIR}"
"/etc/airtime" "/etc/airtime"
"/var/log/airtime" "/var/log/airtime"
"/usr/lib/airtime" "/usr/lib/airtime"
@ -81,7 +80,7 @@ if [ -n "${STOR_DIR}" ]; then
echo -e "\nDo you want to remove your music storage directory ${STOR_DIR} and all of its subdirectories? [y/N]: \c" echo -e "\nDo you want to remove your music storage directory ${STOR_DIR} and all of its subdirectories? [y/N]: \c"
read IN read IN
if [[ ( "$IN" = "y" || "$IN" = "Y" ) ]]; then if [[ ( "$IN" = "y" || "$IN" = "Y" ) ]]; then
rm -rf ${STOR_DIR} rm -rf "${STOR_DIR}"
fi fi
else else
echo -e "\nNo stor directory found, skipping..." echo -e "\nNo stor directory found, skipping..."
@ -103,4 +102,4 @@ fi
pip uninstall -y airtime-playout airtime-media-monitor pip uninstall -y airtime-playout airtime-media-monitor
service apache2 restart service apache2 restart
echo "...Done" echo "...Done"