summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2016-01-23 17:10:29 (EST)
committer P. J. McDermott <pj@pehjota.net>2016-01-23 17:10:29 (EST)
commit76c44efdc5fe002e39aaf27ad4cd94f2bc154bda (patch)
treeeb38e4f0791017ef879d15f6d018678b2e8424e5
parentc3863ac4c059ab57db949fa7dc2f3b2b0f0771bc (diff)
Always use rm's -f option
-rw-r--r--src/cmd/build.sh2
-rw-r--r--src/install.sh4
-rw-r--r--src/mutex.sh2
-rw-r--r--src/profile/proteanos.sh2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/build.sh b/src/cmd/build.sh
index 1d0ad52..fe10899 100644
--- a/src/cmd/build.sh
+++ b/src/cmd/build.sh
@@ -145,7 +145,7 @@ cmd_build_fini()
if [ "x${cmd_build_build_deps}" != 'x' ]; then
session_exec opkg --autoremove remove \
prokit-builddeps-$(session_id)
- rm "${cmd_build_root}${session_dir}/builddeps.opk"
+ rm -f "${cmd_build_root}${session_dir}/builddeps.opk"
# Hack to avoid this code branch if the function is called again
# in response to a signal.
cmd_build_build_deps=''
diff --git a/src/install.sh b/src/install.sh
index a42b69e..693c311 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -80,7 +80,7 @@ install_system()
profile_configure_system_foreign "${root}" "${arch}" "${plat}"
fi
- rm "${root}/prokit/installing"
+ rm -f "${root}/prokit/installing"
return 0
}
@@ -295,7 +295,7 @@ install_get_pkgs()
rm -f "${root}/${fname}"
done
- rm "${root}/.prokit/packages"
+ rm -f "${root}/.prokit/packages"
rmdir "${root}/.prokit"
fclose ${status_fd}
diff --git a/src/mutex.sh b/src/mutex.sh
index ab9824c..fe74760 100644
--- a/src/mutex.sh
+++ b/src/mutex.sh
@@ -45,7 +45,7 @@ mutex_unlock()
{
local mutex="${1}"
- rm "${mutex}"
+ rm -f "${mutex}"
}
mutex_is_unlockable()
diff --git a/src/profile/proteanos.sh b/src/profile/proteanos.sh
index 3048227..dfa64e8 100644
--- a/src/profile/proteanos.sh
+++ b/src/profile/proteanos.sh
@@ -33,7 +33,7 @@ start()
printf "disabled\n" >/etc/rc.policy
opkg install $(opkg list-installed | cut -d " " -f 1)
printf "enabled\n" >/etc/rc.policy
- rm "${SCRIPT}"
+ rm -f "${SCRIPT}"
}
'