system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-07-05 17:08:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed doasedit to properly handle files which start with a dash

Browse Source 
character, such as "-bar.txt".
This commit is contained in:
Jesse 2024-05-01 11:15:33 -03:00
parent 10ca176f40
commit e595a0d397
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doasedit
View File

@ -14,7 +14,7 @@ fi
if [ ! -f "$1" ]
then
echo "File does not exist or is a special file/link."
echo "File $1 does not exist or is a special file/link."
exit 2
fi
@ -37,7 +37,8 @@ then
exit 4
fi
cp "$1" "$temp_file"
mydir=$(dirname -- "$1")
cp "$mydir/$1" "$temp_file"
if [ ! $? ]
then
echo "Unable to copy file $1"
@ -62,7 +63,7 @@ then
fi
# Check to see if the file has been changed.
cmp -s "$1" "$temp_file"
cmp -s "$mydir/$1" "$temp_file"
status=$?
if [ $status -eq 0 ]
then
@ -74,16 +75,16 @@ fi
# At this point the file has been changed. Make sure it still exists.
if [ -f "$temp_file" ]
then
doas cp "$temp_file" "$1"
cmp -s "$temp_file" "$1"
doas cp "$temp_file" "$mydir/$1"
cmp -s "$temp_file" "$mydir/$1"
status=$?
# If file fails to copy, do not do clean-up
while [ $status -ne 0 ]
do
echo "Copying file back to $1 failed. Press Ctrl-C to abort or Enter to try again."
read abc
doas cp "$temp_file" "$1"
cmp -s "$temp_file" "$1"
doas cp "$temp_file" "$mydir/$1"
cmp -s "$temp_file" "$mydir/$1"
status=$?
done
fi