Cleanup and add support for systemd tmpfiles

1 files changed, 7 insertions, 11 deletions

diff --git a/amule-daemon.install b/amule-daemon.install
index 1579e001c963..d92d6b84d20b 100644
--- a/amule-daemon.install
+++ b/amule-daemon.install
@@ -10,25 +10,24 @@ _instructions() {
      provide ${bold}[ExternalConnect]${all_off} configuration.
   ${blue}->${all_off} You also need to specify amuleweb password.
      Please follow ${bold}https://wiki.archlinux.org/index.php/AMule${all_off} for more information.
-  ${blue}->${all_off} Service '${bold}amule${all_off}' can be started as '${bold}systemctl start amule${all_off}'.
-  ${blue}->${all_off} Service '${bold}amule@${all_off}' (by user) can be started as '${bold}systemctl start amule@USER${all_off}'
+  ${blue}->${all_off} Service '${bold}amuled${all_off}' can be started as '${bold}systemctl start amuled${all_off}'.
+  ${blue}->${all_off} Service '${bold}amuled@${all_off}' (by user) can be started as '${bold}systemctl start amuled@USER${all_off}'
   ${blue}->${all_off} Service '${bold}amuleweb${all_off}' can be started as '${bold}systemctl start amuleweb${all_off}'.\n"
 }
 
 _notice_if_amuled_exist() {
   printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}
   ${green}==>${all_off} ${bold}Deprecated 'amuled' user/group found:${all_off}
-  ${blue}->${all_off} The deprecated user/group '${bold}amuled${all_off}' has been removed.
+  ${blue}->${all_off} The user/group '${bold}amuled${all_off}' has been deprecated.
   ${blue}->${all_off} New '${bold}amule${all_off}' user/group has been created instead.\n"
 }
 
 _instructions_if_amuled_exist() {
   printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}
   ${blue}->${all_off} The new aMule data path is ${bold}/var/lib/amule${all_off}
-     Please move your Amule data to new path with:
+     Please move your old Amule data to new path with:
 
-     # ${bold}mv /var/lib/amuled/* /var/lib/amule${all_off}
-     # ${bold}chown -R amule:amule /var/lib/amule${all_off}\n"
+     # ${bold}mv /var/lib/amuled/* /var/lib/amule${all_off}\n"
 }
 
 post_install() {
@@ -38,19 +37,16 @@ post_install() {
 
 post_upgrade() {
   if id -u amuled >/dev/null 2>&1; then
-    userdel amuled
-    groupdel amuled
     _notice_if_amuled_exist
   fi
   if [ -d /var/lib/amuled ]; then
     _instructions_if_amuled_exist
   fi
-
-  install -dm744 -o amule -g amule /var/lib/amule
+  true
 }
 
 post_remove() {
-  paths=(/var/lib/amule)
+  paths=(/var/lib/amule /var/lib/amuled)
 
   first=true
   for path in ${paths[@]}; do