From 2bd6efa3b4a967ed074a372776645846271b59be Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 16 Jul 2021 00:15:19 -0500
Subject: network/elemental-ircd: Don't set $USER inside a script

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/elemental-ircd/elemental-ircd.SlackBuild | 2 +-
 network/elemental-ircd/rc.elemental-ircd         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'network/elemental-ircd')

diff --git a/network/elemental-ircd/elemental-ircd.SlackBuild b/network/elemental-ircd/elemental-ircd.SlackBuild
index 909db97e3c379..68bb43d55961a 100644
--- a/network/elemental-ircd/elemental-ircd.SlackBuild
+++ b/network/elemental-ircd/elemental-ircd.SlackBuild
@@ -123,7 +123,7 @@ mkdir -p $PKG/var/lib/$PRGNAM
 
 # Copy rc.elemental-ircd into /etc/rc.d
 mkdir -p $PKG/etc/rc.d
-sed -e "s/@USER@/$IRCD_UNAME/" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
+sed -e "s/@IRCD_UNAME@/$IRCD_UNAME/" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Copy logrotate script into /etc/logrotate.d
 mkdir -p $PKG/etc/logrotate.d
diff --git a/network/elemental-ircd/rc.elemental-ircd b/network/elemental-ircd/rc.elemental-ircd
index 9af9f68ef975d..56726817936bb 100644
--- a/network/elemental-ircd/rc.elemental-ircd
+++ b/network/elemental-ircd/rc.elemental-ircd
@@ -2,13 +2,13 @@
 #
 # elemental-ircd startup script for Slackware
 
-USER="@USER@"
+IRCD_USER="@IRCD_UNAME@"
 PIDFILE="/var/run/elemental-ircd/ircd.pid"
 PID=`cat $PIDFILE 2>/dev/null`
 
 ircd_start() {
   echo "Starting elemental-ircd."
-  su - $USER -c "/usr/bin/ircd -pidfile $PIDFILE"
+  su - $IRCD_USER -c "/usr/bin/ircd -pidfile $PIDFILE"
 }
 
 ircd_stop() {
-- 
cgit v1.2.3