Skip to content

Commit 84eb1ae

Browse files
committed
Remove old templates from setup
1 parent 84e699b commit 84eb1ae

File tree

2 files changed

+10
-112
lines changed

2 files changed

+10
-112
lines changed

Diff for: xabber-server-files/setup.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -697,11 +697,14 @@ fi
697697
EXP00="s#INSTALL_PATH#$installdir#g"
698698
EXP01="s#USER#$systemuser#g"
699699
EXP02="s#GROUP#'$GROUP'#g"
700+
EXP03="s#DEBUG=true#DEBUG=false#g"
700701
sh -c "sed -e $EXP00 <$installdir/xabberserver.service0 >$installdir/xabberserver.service1"
701702
sh -c "sed -e $EXP01 <$installdir/xabberserver.service1 >$installdir/xabberserver.service"
702703
sh -c "sed -e $EXP02 <$installdir/xabberserver.service >/etc/systemd/system/xabberserver.service"
703-
sh -c "sed -e $EXP00 <$installdir/xabberserver.init0 >$installdir/xmppserverui/service.sh"
704-
rm $installdir/xabberserver.init0
704+
sh -c "sed -e $EXP00 <$installdir/xmppserverui/service.sh.template >$installdir/xmppserverui/service.sh.2"
705+
sh -c "sed -e $EXP03 <$installdir/xmppserverui/service.sh.2 >$installdir/xmppserverui/service.sh"
706+
rm $installdir/xmppserverui/service.sh.2
707+
rm $installdir/xmppserverui/service.sh.template
705708
rm $installdir/xabberserver.service
706709
rm $installdir/xabberserver.service1
707710
rm $installdir/xabberserver.service0
@@ -725,8 +728,11 @@ echo "Installation started"
725728
mkdir $installdir/certs
726729
mv $installdir/server.pem $installdir/certs
727730
EXP00="s#INSTALL_PATH#$installdir#g"
728-
sh -c "sed -e $EXP00 <$installdir/xabberserver.init0 >$installdir/xmppserverui/service.sh"
729-
rm $installdir/xabberserver.init0
731+
EXP03="s#DEBUG=true#DEBUG=false#g"
732+
sh -c "sed -e $EXP00 <$installdir/xmppserverui/service.sh.template >$installdir/xmppserverui/service.sh.2"
733+
sh -c "sed -e $EXP03 <$installdir/xmppserverui/service.sh.2 >$installdir/xmppserverui/service.sh"
734+
rm $installdir/xmppserverui/service.sh.2
735+
rm $installdir/xmppserverui/service.sh.template
730736
rm $installdir/xabberserver.service0
731737
rm $installdir/setup.sh
732738
chmod 755 $installdir/xmppserverui/service.sh

Diff for: xabber-server-files/xabberserver.init0

-108
This file was deleted.

0 commit comments

Comments
 (0)