From 3ec27a66b482d862b9ef7fe7446a9b65cf10d1b8 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Wed, 3 Feb 2021 17:07:23 -0500
Subject: [PATCH] move paths to variables

---
 doasedit | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/doasedit b/doasedit
index 688c55b..42e2f2b 100755
--- a/doasedit
+++ b/doasedit
@@ -18,27 +18,29 @@ while [ -d "/tmp/doasedit/$destfile_pfx" ]; do
 	destfile_pfx="$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32)"
 done
 
-mkdir -p /tmp/doasedit/$destfile_pfx
+tempdir="/tmp/doasedit/$destfile_pfx"
+
+mkdir -p $tempdir
 srcfile="$(doas realpath $1)"
 
 if doas [ -f "$srcfile" ]; then
-	doas cp $srcfile /tmp/doasedit/$destfile_pfx/edit
-	doas chown -R $USER:$USER /tmp/doasedit/$destfile_pfx/edit
-	doas cp $srcfile /tmp/doasedit/$destfile_pfx/file
+	doas cp $srcfile $tempdir/edit
+	doas chown -R $USER:$USER $tempdir/edit
+	doas cp $srcfile $tempdir/file
 else
 	# create file with "regular" system permissions (root:root 644)
-	touch /tmp/doasedit/$destfile_pfx/file
-	doas chown root:root /tmp/doasedit/$destfile_pfx/file
+	touch $tempdir/file
+	doas chown root:root $tempdir/file
 fi
 
-$EDITOR /tmp/doasedit/$destfile_pfx/edit
+$EDITOR $tempdir/edit
 
-cat /tmp/doasedit/$destfile_pfx/edit | doas tee /tmp/doasedit/$destfile_pfx/file 1>/dev/null
+cat $tempdir/edit | doas tee $tempdir/file 1>/dev/null
 
-if cmp -s "/tmp/doasedit/$destfile_pfx/file" "$srcfile"; then
+if cmp -s "$tempdir/file" "$srcfile"; then
 	echo "Skipping write; no changes."
 else
-	doas mv -f /tmp/doasedit/$destfile_pfx/file $srcfile
+	doas mv -f $tempdir/file $srcfile
 fi
 
-rm -rf /tmp/doasedit/$destfile_pfx
+rm -rf $tempdir