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

Prevent always requiring root user on exiting script

Browse Source 
fix #77, fix #78
This commit is contained in:
Marcus Whybrow 2012-08-12 01:46:18 +01:00
parent 416ac12bfd
commit 9a485f0b89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/msm
View File

@ -1977,6 +1977,7 @@ command_update() {
fi fi
manager_property UPDATE_URL manager_property UPDATE_URL
manager_property USERNAME
# Create the temp download directory # Create the temp download directory
local output_dir="/tmp/msmupdate" local output_dir="/tmp/msmupdate"
@ -1985,6 +1986,7 @@ command_update() {
download_file() { download_file() {
local dir_name="$(dirname "${output_dir}/${1}")" local dir_name="$(dirname "${output_dir}/${1}")"
as_user "root" "mkdir -p \"${dir_name}\"" as_user "root" "mkdir -p \"${dir_name}\""
as_user "root" "chown ${SETTINGS_USERNAME}:${SETTINGS_USERNAME} \"${dir_name}\""
as_user "root" "wget --quiet --trust-server-names --no-check-certificate ${SETTINGS_UPDATE_URL}/$1 -O ${output_dir}/$1" as_user "root" "wget --quiet --trust-server-names --no-check-certificate ${SETTINGS_UPDATE_URL}/$1 -O ${output_dir}/$1"
} }
@ -2197,7 +2199,6 @@ command_update() {
# Overwrite the versioning files # Overwrite the versioning files
manager_property VERSIONING_STORAGE_PATH manager_property VERSIONING_STORAGE_PATH
manager_property USERNAME
local version_name version_path regex local version_name version_path regex
regex="/(([^/]+/[^/]+)\.[^/\.]*)$" regex="/(([^/]+/[^/]+)\.[^/\.]*)$"
@ -3764,7 +3765,8 @@ interrupt() {
done done
# Clean up the temp directory created for downloads # Clean up the temp directory created for downloads
as_user "root" "rm -rf \"${output_dir}\"" manager_property USERNAME
as_user "$SETTINGS_USERNAME" "rm -rf \"${output_dir}\""
exit exit
} }