install-sh (flatpak-1.8.2.tar.xz) | : | install-sh (flatpak-1.8.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 454 | skipping to change at line 454 | |||
else | else | |||
# Make a couple of temp file names in the proper directory. | # Make a couple of temp file names in the proper directory. | |||
dsttmp=${dstdirslash}_inst.$$_ | dsttmp=${dstdirslash}_inst.$$_ | |||
rmtmp=${dstdirslash}_rm.$$_ | rmtmp=${dstdirslash}_rm.$$_ | |||
# Trap to clean up those temp files at exit. | # Trap to clean up those temp files at exit. | |||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 | trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 | |||
# Copy the file name to the temp name. | # Copy the file name to the temp name. | |||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && | (umask $cp_umask && | |||
{ test -z "$stripcmd" || { | ||||
# Create $dsttmp read-write so that cp doesn't create it read-only, | ||||
# which would cause strip to fail. | ||||
if test -z "$doit"; then | ||||
: >"$dsttmp" # No need to fork-exec 'touch'. | ||||
else | ||||
$doit touch "$dsttmp" | ||||
fi | ||||
} | ||||
} && | ||||
$doit_exec $cpprog "$src" "$dsttmp") && | ||||
# and set any options; do chmod last to preserve setuid bits. | # and set any options; do chmod last to preserve setuid bits. | |||
# | # | |||
# If any of these fail, we abort the whole thing. If we want to | # If any of these fail, we abort the whole thing. If we want to | |||
# ignore errors from any of these, just make sure not to ignore | # ignore errors from any of these, just make sure not to ignore | |||
# errors from the above "$doit $cpprog $src $dsttmp" command. | # errors from the above "$doit $cpprog $src $dsttmp" command. | |||
# | # | |||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && | { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && | |||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && | { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && | |||
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && | { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 12 lines changed or added |