From 157524b7cb76c5044a27f4a9e373ee04a9da3c71 Mon Sep 17 00:00:00 2001
From: Ahmad Draidi <a.r.draidi@redscript.org>
Date: Tue, 9 Apr 2024 18:26:52 +0400
Subject: [PATCH] Use arcan from setuid-programs if available

---
 distr/durden | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/distr/durden b/distr/durden
index ab431ce..8672556 100755
--- a/distr/durden
+++ b/distr/durden
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ -n "$(command -v /run/setuid-programs/arcan 2>/dev/null)" ]; then
+	ARCAN_CMD="/run/setuid-programs/arcan"
+else
+	ARCAN_CMD="@ARCAN_STORE_PATH@"
+fi
+
 arcan_base=${HOME}/.arcan
 applname="$(basename $0)"
 distargs=""
@@ -98,11 +104,11 @@ while true; do
 	starttime=$(date +%s)
 
 	if [ -d "${arcan_logpath}" ]; then
-		if arcan ${distargs} -b "$applname" "$applname" "$@" >"${arcan_logpath}/${applname}_${starttime}.log" 2>&1; then
+		if "${ARCAN_CMD}" ${distargs} -b "$applname" "$applname" "$@" >"${arcan_logpath}/${applname}_${starttime}.log" 2>&1; then
 			exit
 		fi
 	else
-		if arcan ${distargs} -b "$applname" "$applname" "$@"; then
+		if "${ARCAN_CMD}" ${distargs} -b "$applname" "$applname" "$@"; then
 			exit
 		fi
 	fi
-- 
2.41.0

href='/guix/tree/graph.js?id=dac3fc069287ca2233e941c12d305954ad30f947'>tree</a><a href='/guix/commit/graph.js?id=dac3fc069287ca2233e941c12d305954ad30f947'>commit</a><a href='/guix/diff/graph.js?id=dac3fc069287ca2233e941c12d305954ad30f947'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/graph.js'>
<input type='hidden' name='id' value='dac3fc069287ca2233e941c12d305954ad30f947'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=dac3fc069287ca2233e941c12d305954ad30f947'>root</a>/<a href='/guix/log/graph.js?id=dac3fc069287ca2233e941c12d305954ad30f947'>graph.js</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/graph.js?id=dac3fc069287ca2233e941c12d305954ad30f947&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-12-14 21:58:32 +0100'>2016-12-14</span></td><td><a href='/guix/commit/graph.js?id=4d93f312f084c34a70cf7da3abe5f92a74d76861'>graph: Add d3js backend.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
-02-18</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=5a57313918a5c1bd5cf8238c2dcae64a03523952'>profiles: 'profile-derivation' rejects unsupported packages.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=2ca982ff41270288913ad6b7d5d9e1cad87b06d9'>gnu: bootloader: Support multiple targets.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-29 01:22:04 +0200'>2021-04-29</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=524c9800afb433cc474132185d8e37f72004adb3'>diagnostics, ui: Adjust to 'read-error' and 'syntax-error' in Guile 3.0.6.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-02-17 10:57:02 +0100'>2021-02-17</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=6e8cdf1d26092cb9654e179b04730fff7c15c94f'>scripts: system: Accept &lt;image&gt; records as input.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-02-17 10:52:28 +0100'>2021-02-17</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=ee2a5da80a9bda25542c00a7a35a9ddddcbd58af'>scripts: system: Remove 'vm-image' command.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-01-30 15:36:58 +0100'>2021-01-30</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=b84152439c298724c36e1282e4feb9ce246b76c3'>guix system: Test 'extension-graph' and 'shepherd-graph'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-19 17:16:56 +0100'>2021-01-19</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=e74baa124592428f05b17562f180469e405037f3'>system: Rename 'disk-image' command 'image'.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-01-13 22:24:18 +0100'>2021-01-13</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=0d22fc8d36e4efba9748c94cab7cedbbe2bbb5bf'>services: shepherd: 'shepherd-service-type' requires documentation.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-06 16:38:12 +0100'>2020-11-06</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=9e2523c25f7b8d6e8c29c679ad899703a120eed8'>tests: Test "guix system search .".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-10-02 08:11:38 +0200'>2020-10-02</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=f43ffee90882c2d61b46d69728daa7432be297e4'>gexp: 'local-file' warns when passed a non-literal relative file name.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-30 10:47:59 +0200'>2020-09-30</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=313f492657f1d0863c641fa5ee7f5b7028e27c94'>scripts: system: Add support for image-type.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-06-08 13:51:19 +0200'>2020-06-08</span></td><td><a href='/guix/commit/tests/guix-system.sh?id=59bcffa314171294278444aad4b7012abe50257a'>system: examples: Add bare-hurd.tmpl.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>