rebuild-alpine.sh: Added more checks for unwanted packages at start of build and after each package

1 files changed, 18 insertions, 1 deletions

diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh
index c93e4b6c1f..d955024199 100755
--- a/rebuild-alpine.sh
+++ b/rebuild-alpine.sh
@@ -72,7 +72,16 @@ build () {
         fi
     done
     cd $rootdir
-    if [ -n $(apk info | grep libiconv) ]; then echo "***** libiconv stuck *****"; sudo apk del libiconv; fi
+    
+    if [ -n "$(apk info | grep libiconv)" ]; then 
+        echo "***** libiconv stuck *****"
+        sudo apk del libiconv
+    fi
+    
+    if [ -n "$(apk info | grep gettext)" ]; then 
+        echo "***** gettext stuck *****"
+        sudo apk del gettext
+    fi
 }
 
 touch START_OF_BUILD.txt
@@ -100,6 +109,14 @@ git pull
 #abuild -Ru
 #cd $rootdir
 
+if [ -n "$(apk info | grep libiconv)" ]; then 
+    sudo apk del libiconv
+fi
+    
+if [ -n "$(apk info | grep gettext)" ]; then 
+    sudo apk del gettext
+fi
+
 for s in main testing unstable ; do
     echo "Building packages in $s"
     build $s