From f3978446039ccd8ceaaf042aec33c84aa023239d Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 20 Feb 2016 16:08:02 +0000 Subject: [PATCH] Remove conflicted merge markup. Not sure how that got through. --- automated install/basic-install.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 1a021089..75f32116 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -117,7 +117,6 @@ welcomeDialogs() { verifyFreeDiskSpace() { -<<<<<<< HEAD # 25MB is the minimum space needed (20MB install + 5MB one day of logs.) requiredFreeBytes=25600 @@ -131,20 +130,6 @@ verifyFreeDiskSpace() { echo "Insufficient free space, exiting..." exit 1 fi -======= - # 25MB is the minimum space needed (20MB install + 5MB one day of logs.) - requiredFreeBytes=25600 - - existingFreeBytes=`df -lk / 2>&1 | awk '{print $4}' | head -2 | tail -1` - if ! [[ "$existingFreeBytes" =~ ^[0-9]\+$ ]]; then - existingFreeBytes=`df -lk /dev 2>&1 | awk '{print $4}' | head -2 | tail -1` - fi - - if [[ $existingFreeBytes -lt $requiredFreeBytes ]]; then - whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $requiredFreeBytes Bytes.\nYou only have $existingFreeBytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n 'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c - exit 1 - fi ->>>>>>> development }