diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh index 97657b1..1c43e86 100755 --- a/server_scripts/gen_install.sh +++ b/server_scripts/gen_install.sh @@ -98,7 +98,7 @@ mkdir -p "$tmpdir" || exit $? ) # cleanup -rm -rd "$tmpdir" || exit $? +rm -r "$tmpdir" || exit $? zpkg -f update-database >/dev/null || exit $? ' >> install.sh diff --git a/src/deploy.sh b/src/deploy.sh index bb100ce..ef74cb1 100644 --- a/src/deploy.sh +++ b/src/deploy.sh @@ -28,7 +28,7 @@ package() [ $size -gt 1048576 ] && cc=$pcompress tar -cf - --owner=0 --group=0 $list | $cc $comparg > "$pkg" ) - [ -n "$tmpdir" ] && rm -rd "$tmpdir" + [ -n "$tmpdir" ] && rm -r "$tmpdir" return 0 } diff --git a/src/install.sh b/src/install.sh index c39f3d2..55dfce6 100644 --- a/src/install.sh +++ b/src/install.sh @@ -49,6 +49,6 @@ install_package() add_package_entry "$1" $2 ) ret=$? - rm -rd "$tmpdir" 2>/dev/null + rm -r "$tmpdir" 2>/dev/null return $ret } diff --git a/src/main.sh b/src/main.sh index 0d5aade..1b348a7 100644 --- a/src/main.sh +++ b/src/main.sh @@ -117,14 +117,14 @@ list-outdated) virtual_config_path "$tmpdir" || exit $? fetch_pkglist > /dev/null || exit $? outdated_packages - rm -rd "$tmpdir" + rm -r "$tmpdir" ;; list-removed) tmpdir="$TMPDIR/zpkg_$(random_string 5)" virtual_config_path "$tmpdir" || exit $? fetch_pkglist > /dev/null || exit $? removed_packages - rm -rd "$tmpdir" + rm -r "$tmpdir" ;; deploy) shift 1 diff --git a/src/upgrade.sh b/src/upgrade.sh index 2a9278b..128fa05 100644 --- a/src/upgrade.sh +++ b/src/upgrade.sh @@ -35,7 +35,7 @@ upgrade_package() add_package_entry "$1" $2 ) ret=$? - rm -rd "$tmpdir" 2>/dev/null + rm -r "$tmpdir" 2>/dev/null return $ret }