Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve update cleanup to prevent auth messages after every command

Browse Source
This commit is contained in:
Marcus Whybrow 2012-08-12 01:55:18 +01:00
parent 7affffda32
commit 04a30f4b31
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init/msm
View File

@ -1982,6 +1982,14 @@ command_update() {
# Create the temp download directory # Create the temp download directory
local output_dir="/tmp/msmupdate" local output_dir="/tmp/msmupdate"
# Clean up the temp directory created for downloads
cleanup() {
as_user "$SETTINGS_USERNAME" "rm -rf \"${output_dir}\""
}
# Remove the directory if it exists already
cleanup
# $1: The file name to download # $1: The file name to download
download_file() { download_file() {
local dir_name="$(dirname "${output_dir}/${1}")" local dir_name="$(dirname "${output_dir}/${1}")"
@ -2235,6 +2243,8 @@ command_update() {
echo "MSM was not updated." echo "MSM was not updated."
fi fi
cleanup
# This script will now be replaced. So run the new script's # This script will now be replaced. So run the new script's
# update code, incase there are new things to update that # update code, incase there are new things to update that
# this version of MSM does not know about yet. # this version of MSM does not know about yet.
@ -3764,10 +3774,6 @@ interrupt() {
fi fi
done done
# Clean up the temp directory created for downloads
manager_property USERNAME
as_user "$SETTINGS_USERNAME" "rm -rf \"${output_dir}\""
exit exit
} }