aboutsummaryrefslogtreecommitdiffstats
path: root/astro
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2003-06-14 05:28:33 +0800
committerosa <osa@FreeBSD.org>2003-06-14 05:28:33 +0800
commit1f560eeefc3e681f1c3467a2974c640366777034 (patch)
tree82b7016a67a3740b83ed0398b2ca73da69f91dbe /astro
parentc1929c6c5ae9ab78fb11f759ec608c83572a89d3 (diff)
downloadfreebsd-ports-gnome-1f560eeefc3e681f1c3467a2974c640366777034.tar.gz
freebsd-ports-gnome-1f560eeefc3e681f1c3467a2974c640366777034.tar.zst
freebsd-ports-gnome-1f560eeefc3e681f1c3467a2974c640366777034.zip
Use proxy/socks settings when registering setiathome
Submitted by: Scot W. Hetzel <hetzels@westbend.net> Approved by: Cyrille Lefevre <cyrille.lefevre@laposte.net> (maintainer) PR: 53126 Approved by: fjoe (implicit)
Diffstat (limited to 'astro')
-rw-r--r--astro/setiathome/files/setiathome.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/astro/setiathome/files/setiathome.sh b/astro/setiathome/files/setiathome.sh
index b30de99e664f..3823454a9489 100644
--- a/astro/setiathome/files/setiathome.sh
+++ b/astro/setiathome/files/setiathome.sh
@@ -50,16 +50,17 @@ program_file=${rc_file%.sh}
program_path=${program_dir}/${program_file}
export program_path
-program_args="\
-${seti_std_args} \
+common_args="\
${seti_proxy_server:+-proxy} ${seti_proxy_server} \
${seti_socks_server:+-socks_server} ${seti_socks_server} \
${seti_socks_user:+-socks_user} ${seti_socks_user} \
${seti_socks_passwd:+-socks_passwd} ${seti_socks_passwd} \
${seti_nice:+-nice} ${seti_nice} \
"
-export program_args
+program_args="${seti_std_args} ${common_args}"
+export program_args
+register_args="${seti_reg_args} ${common_args}"
wrapper_dir=${PREFIX}/libexec
wrapper_file=${rc_file%.sh}.bin
@@ -202,8 +203,7 @@ register)
if [ "X${seti_dontlogin}" != "Xyes" ]; then
su -fm ${seti_user} -c "\
cd ${seti_wrkdir} && \
- exec ${program_path} \
- ${seti_reg_args} ${seti_proxy_args}"
+ exec ${program_path} ${register_args}"
fi
if [ ${seti_maxprocs} -gt 1 ]; then
echo " Updating additional working directories."