Fix empty purge_list.

cross-rs · Jan 1, 2020 · 6542a91 · 6542a91
1 parent 9993a51
commit 6542a91
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 24 deletions.
diff --git a/docker/android-ndk.sh b/docker/android-ndk.sh
@@ -35,8 +35,9 @@ main() {
       --arch $arch \
       --api $api
 
-    # clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
     popd

diff --git a/docker/android-system.sh b/docker/android-system.sh
@@ -116,8 +116,9 @@ EOF
 
     echo "127.0.0.1 localhost" > /system/etc/hosts
 
-    # clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
 

diff --git a/docker/cmake.sh b/docker/cmake.sh
@@ -37,7 +37,9 @@ main() {
     # clean up
     popd
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm -rf $td
     rm $0

diff --git a/docker/dragonfly.sh b/docker/dragonfly.sh
@@ -140,7 +140,9 @@ EOF
     # clean up
     popd
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm -rf $td
     rm $0

diff --git a/docker/dropbear.sh b/docker/dropbear.sh
@@ -48,8 +48,9 @@ main() {
     make -j$(nproc) PROGRAMS=dbclient
     cp dbclient /usr/local/bin/
 
-    # Clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
 

diff --git a/docker/emscripten.sh b/docker/emscripten.sh
@@ -43,8 +43,9 @@ main() {
     chmod a+rw -R /emsdk-portable/
     find /emsdk-portable/ -executable -print0 | xargs -0 chmod a+x
 
-    # Clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm $0
 }

diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -107,7 +107,9 @@ main() {
     # clean up
     popd
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm -rf $td
     rm $0

diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -248,7 +248,11 @@ EOF
     # can fail if arch is used (amd64 and/or i386)
     dpkg --remove-architecture $arch || true
     apt-get update
-    apt-get purge --auto-remove -y ${purge_list[@]}
+
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
+
     ls -lh /qemu
 }
 

diff --git a/docker/mingw.sh b/docker/mingw.sh
@@ -18,16 +18,15 @@ main() {
         $(apt-cache showsrc gcc-mingw-w64-i686 | grep Build | cut -d: -f2 | tr , '\n' | cut -d' ' -f2 | sort | uniq)
     )
 
+    apt-get update
     local purge_list=()
     for dep in ${dependencies[@]}; do
         if ! dpkg -L $dep > /dev/null; then
+            apt-get install -y --no-install-recommends $dep
             purge_list+=( $dep )
         fi
     done
 
-    apt-get update
-    apt-get install -y --no-install-recommends ${purge_list[@]}
-
     pushd $td
 
     apt-get source gcc-mingw-w64-i686
@@ -118,8 +117,9 @@ EOF
     # Replace installed mingw packages with the new ones
     dpkg -i ../g*-mingw-w64-i686*.deb ../gcc-mingw-w64-base*.deb
 
-    # Clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
 

diff --git a/docker/musl.sh b/docker/musl.sh
@@ -48,8 +48,9 @@ main() {
         OUTPUT=/usr/local/ \
         "$@"
 
-    # clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
 

diff --git a/docker/netbsd.sh b/docker/netbsd.sh
@@ -111,7 +111,9 @@ main() {
     # clean up
     popd
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm -rf $td
     rm $0

diff --git a/docker/qemu.sh b/docker/qemu.sh
@@ -88,8 +88,9 @@ main() {
     # in /usr/bin. Create an appropriate symlink
     ln -s /usr/local/bin/qemu-$arch /usr/bin/qemu-$arch-static
 
-    # Clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     popd
 

diff --git a/docker/solaris.sh b/docker/solaris.sh
@@ -133,7 +133,9 @@ EOF
     # clean up
     popd
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
 
     rm -rf $td
     rm $0

diff --git a/docker/xargo.sh b/docker/xargo.sh
@@ -29,7 +29,10 @@ main() {
 
     rm -r "${RUSTUP_HOME}" "${CARGO_HOME}"
 
-    apt-get purge --auto-remove -y ${purge_list[@]}
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --auto-remove -y ${purge_list[@]}
+    fi
+
     rm $0
 }