From 713432d8a4c8420f26898bd4eded50bbcc521774 Mon Sep 17 00:00:00 2001
From: arakasi72 <arakasi72@users.noreply.github.com>
Date: Fri, 13 Oct 2017 17:55:35 +0100
Subject: [PATCH] Develop (#267)

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtadduser

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtinst

* Update rtadduser
---
 scripts/rtadduser | 19 +++++++++++++++----
 scripts/rtinst    | 20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/scripts/rtadduser b/scripts/rtadduser
index ac40f1d..d94bbb8 100755
--- a/scripts/rtadduser
+++ b/scripts/rtadduser
@@ -323,7 +323,6 @@ unzip -o autodl-irssi.zip >> /dev/null 2>&1
 rm autodl-irssi.zip
 cp autodl-irssi.pl autorun/
 mkdir -p $home/.autodl
-touch $home/.autodl/autodl.cfg && touch $home/.autodl/autodl2.cfg
 
 echo "<?php" > /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 echo >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
@@ -333,9 +332,21 @@ echo >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 echo "?>" >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 
 cd $home/.autodl
-echo "[options]" > autodl2.cfg
-echo "gui-server-port = $adlport" >> autodl2.cfg
-echo "gui-server-password = $adlpass" >> autodl2.cfg
+
+if [ -f "autodl.cfg" ]; then
+  if (grep -sq gui-server-port autodl.cfg) && (grep -sq gui-server-password autodl.cfg); then
+    sed -i "/gui-server-port/ c\gui-server-port = $adlport" autodl.cfg
+    sed -i "/gui-server-password/ c\gui-server-password = $adlpass" autodl.cfg
+  else
+    sed -i '/gui-server-port/ d' autodl.cfg
+    sed -i '/gui-server-password/ d' autodl.cfg
+    sed -i "1s/^/[options]\ngui-server-port = $adlport\ngui-server-password = $adlpass\n\n/" autodl.cfg
+  fi
+else
+  echo "[options]" > autodl.cfg
+  echo "gui-server-port = $adlport" >> autodl.cfg
+  echo "gui-server-password = $adlpass" >> autodl.cfg
+fi
 
 chown -R $user:$user $home
 chown -R www-data:www-data /var/www/rutorrent
diff --git a/scripts/rtinst b/scripts/rtinst
index 6fa8ba2..71c7a1e 100755
--- a/scripts/rtinst
+++ b/scripts/rtinst
@@ -775,7 +775,6 @@ unzip -qq -o autodl-irssi.zip | tee -a $logfile
 rm autodl-irssi.zip
 cp autodl-irssi.pl autorun/
 mkdir -p $home/.autodl
-touch $home/.autodl/autodl.cfg && touch $home/.autodl/autodl2.cfg
 
 cd /var/www/rutorrent/plugins
 git clone -q https://github.com/autodl-community/autodl-rutorrent.git autodl-irssi | tee -a $home/rtinst.info
@@ -792,9 +791,22 @@ echo >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 echo "?>" >> /var/www/rutorrent/conf/users/$user/plugins/autodl-irssi/conf.php
 
 cd $home/.autodl
-echo "[options]" > autodl2.cfg
-echo "gui-server-port = $adlport" >> autodl2.cfg
-echo "gui-server-password = $adlpass" >> autodl2.cfg
+rm -f autodl2.cfg
+
+if [ -f "autodl.cfg" ]; then
+  if (grep -sq gui-server-port autodl.cfg) && (grep -sq gui-server-password autodl.cfg); then
+    sed -i "/gui-server-port/ c\gui-server-port = $adlport" autodl.cfg
+    sed -i "/gui-server-password/ c\gui-server-password = $adlpass" autodl.cfg
+  else
+    sed -i '/gui-server-port/ d' autodl.cfg
+    sed -i '/gui-server-password/ d' autodl.cfg
+    sed -i "1s/^/[options]\ngui-server-port = $adlport\ngui-server-password = $adlpass\n\n/" autodl.cfg
+  fi
+else
+  echo "[options]" > autodl.cfg
+  echo "gui-server-port = $adlport" >> autodl.cfg
+  echo "gui-server-password = $adlpass" >> autodl.cfg
+fi
 
 ###############################
 ### FINAL TASKS ###