psi-jack/yadm
1
0
Fork 0
mirror of synced 2025-01-08 14:11:06 -05:00
Code Issues Releases Wiki Activity

Fix updating of readonly files

Browse source
This commit is contained in:
Ross Smith II 2021-01-30 18:17:59 -08:00
parent a5b1067e02
commit 96471a6d68
No known key found for this signature in database
GPG key ID: A05F962FB6A849D2
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
yadm
View file

@ -436,10 +436,7 @@ EOF
"$awk_pgm" \ "$awk_pgm" \
"$input" > "$temp_file" || rm -f "$temp_file" "$input" > "$temp_file" || rm -f "$temp_file"
if [ -f "$temp_file" ] ; then move_file "$input" "$output" "$temp_file"
copy_perms "$input" "$temp_file"
mv -f "$temp_file" "$output"
fi
} }
function template_j2cli() { function template_j2cli() {
@ -455,10 +452,7 @@ function template_j2cli() {
YADM_SOURCE="$input" \ YADM_SOURCE="$input" \
"$J2CLI_PROGRAM" "$input" -o "$temp_file" "$J2CLI_PROGRAM" "$input" -o "$temp_file"
if [ -f "$temp_file" ] ; then move_file "$input" "$output" "$temp_file"
copy_perms "$input" "$temp_file"
mv -f "$temp_file" "$output"
fi
} }
function template_envtpl() { function template_envtpl() {
@ -474,10 +468,7 @@ function template_envtpl() {
YADM_SOURCE="$input" \ YADM_SOURCE="$input" \
"$ENVTPL_PROGRAM" --keep-template "$input" -o "$temp_file" "$ENVTPL_PROGRAM" --keep-template "$input" -o "$temp_file"
if [ -f "$temp_file" ] ; then move_file "$input" "$output" "$temp_file"
copy_perms "$input" "$temp_file"
mv -f "$temp_file" "$output"
fi
} }
function template_esh() { function template_esh() {
@ -493,9 +484,27 @@ function template_esh() {
YADM_DISTRO="$local_distro" \ YADM_DISTRO="$local_distro" \
YADM_SOURCE="$input" YADM_SOURCE="$input"
if [ -f "$temp_file" ] ; then move_file "$input" "$output" "$temp_file"
copy_perms "$input" "$temp_file" }
mv -f "$temp_file" "$output"
function move_file() {
local input=$1
local output=$2
local temp_file=$3
if [ ! -f "$temp_file" ] ; then
return 0
fi
local read_only
copy_perms "$input" "$temp_file"
if [[ -e "$output" && ! -w "$output" ]]; then
read_only=1
chmod u+w "$output"
fi
mv -f "$temp_file" "$output"
if [ -n "$read_only" ]; then
chmod u-w "$output"
fi fi
} }