Przeglądaj źródła

refactor(backup): unify backupdir on all configs (#2405)

Co-authored-by: Christian Birk <chris.h3o66@gmail.com>
Christian 6 lat temu
rodzic
commit
20473df46e
90 zmienionych plików z 136 dodań i 110 usunięć
  1. 1 1
      lgsm/config-default/config-lgsm/ahlserver/_default.cfg
  2. 1 1
      lgsm/config-default/config-lgsm/bb2server/_default.cfg
  3. 1 1
      lgsm/config-default/config-lgsm/bbserver/_default.cfg
  4. 1 1
      lgsm/config-default/config-lgsm/bdserver/_default.cfg
  5. 1 1
      lgsm/config-default/config-lgsm/bf1942server/_default.cfg
  6. 1 1
      lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
  7. 1 1
      lgsm/config-default/config-lgsm/boserver/_default.cfg
  8. 1 1
      lgsm/config-default/config-lgsm/bsserver/_default.cfg
  9. 1 1
      lgsm/config-default/config-lgsm/btserver/_default.cfg
  10. 1 1
      lgsm/config-default/config-lgsm/ccserver/_default.cfg
  11. 1 1
      lgsm/config-default/config-lgsm/cod2server/_default.cfg
  12. 1 1
      lgsm/config-default/config-lgsm/cod4server/_default.cfg
  13. 1 1
      lgsm/config-default/config-lgsm/codserver/_default.cfg
  14. 1 1
      lgsm/config-default/config-lgsm/coduoserver/_default.cfg
  15. 1 1
      lgsm/config-default/config-lgsm/codwawserver/_default.cfg
  16. 1 1
      lgsm/config-default/config-lgsm/csczserver/_default.cfg
  17. 1 1
      lgsm/config-default/config-lgsm/csserver/_default.cfg
  18. 1 1
      lgsm/config-default/config-lgsm/cssserver/_default.cfg
  19. 1 1
      lgsm/config-default/config-lgsm/dabserver/_default.cfg
  20. 1 1
      lgsm/config-default/config-lgsm/dmcserver/_default.cfg
  21. 1 1
      lgsm/config-default/config-lgsm/dodserver/_default.cfg
  22. 1 1
      lgsm/config-default/config-lgsm/dodsserver/_default.cfg
  23. 1 1
      lgsm/config-default/config-lgsm/doiserver/_default.cfg
  24. 1 1
      lgsm/config-default/config-lgsm/dstserver/_default.cfg
  25. 1 1
      lgsm/config-default/config-lgsm/dysserver/_default.cfg
  26. 1 1
      lgsm/config-default/config-lgsm/ecoserver/_default.cfg
  27. 1 1
      lgsm/config-default/config-lgsm/emserver/_default.cfg
  28. 1 1
      lgsm/config-default/config-lgsm/etlserver/_default.cfg
  29. 1 1
      lgsm/config-default/config-lgsm/fctrserver/_default.cfg
  30. 1 1
      lgsm/config-default/config-lgsm/fofserver/_default.cfg
  31. 1 1
      lgsm/config-default/config-lgsm/gesserver/_default.cfg
  32. 1 1
      lgsm/config-default/config-lgsm/gmodserver/_default.cfg
  33. 1 1
      lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg
  34. 1 1
      lgsm/config-default/config-lgsm/hldmserver/_default.cfg
  35. 1 1
      lgsm/config-default/config-lgsm/hldmsserver/_default.cfg
  36. 1 1
      lgsm/config-default/config-lgsm/hwserver/_default.cfg
  37. 1 1
      lgsm/config-default/config-lgsm/insserver/_default.cfg
  38. 1 1
      lgsm/config-default/config-lgsm/iosserver/_default.cfg
  39. 1 1
      lgsm/config-default/config-lgsm/jc2server/_default.cfg
  40. 1 1
      lgsm/config-default/config-lgsm/jc3server/_default.cfg
  41. 1 1
      lgsm/config-default/config-lgsm/kfserver/_default.cfg
  42. 1 1
      lgsm/config-default/config-lgsm/l4d2server/_default.cfg
  43. 1 1
      lgsm/config-default/config-lgsm/l4dserver/_default.cfg
  44. 1 1
      lgsm/config-default/config-lgsm/mcserver/_default.cfg
  45. 1 1
      lgsm/config-default/config-lgsm/mtaserver/_default.cfg
  46. 1 1
      lgsm/config-default/config-lgsm/mumbleserver/_default.cfg
  47. 1 1
      lgsm/config-default/config-lgsm/ndserver/_default.cfg
  48. 1 1
      lgsm/config-default/config-lgsm/nmrihserver/_default.cfg
  49. 1 1
      lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
  50. 1 1
      lgsm/config-default/config-lgsm/ns2server/_default.cfg
  51. 1 1
      lgsm/config-default/config-lgsm/nsserver/_default.cfg
  52. 1 1
      lgsm/config-default/config-lgsm/opforserver/_default.cfg
  53. 1 1
      lgsm/config-default/config-lgsm/pcserver/_default.cfg
  54. 1 1
      lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg
  55. 1 1
      lgsm/config-default/config-lgsm/pzserver/_default.cfg
  56. 1 1
      lgsm/config-default/config-lgsm/q2server/_default.cfg
  57. 1 1
      lgsm/config-default/config-lgsm/q3server/_default.cfg
  58. 1 1
      lgsm/config-default/config-lgsm/qlserver/_default.cfg
  59. 1 1
      lgsm/config-default/config-lgsm/qwserver/_default.cfg
  60. 1 1
      lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
  61. 1 1
      lgsm/config-default/config-lgsm/roserver/_default.cfg
  62. 1 1
      lgsm/config-default/config-lgsm/rtcwserver/_default.cfg
  63. 1 1
      lgsm/config-default/config-lgsm/rustserver/_default.cfg
  64. 1 1
      lgsm/config-default/config-lgsm/rwserver/_default.cfg
  65. 1 1
      lgsm/config-default/config-lgsm/sampserver/_default.cfg
  66. 1 1
      lgsm/config-default/config-lgsm/sbotsserver/_default.cfg
  67. 1 1
      lgsm/config-default/config-lgsm/sbserver/_default.cfg
  68. 1 1
      lgsm/config-default/config-lgsm/sfcserver/_default.cfg
  69. 1 1
      lgsm/config-default/config-lgsm/sof2server/_default.cfg
  70. 1 1
      lgsm/config-default/config-lgsm/solserver/_default.cfg
  71. 1 1
      lgsm/config-default/config-lgsm/ss3server/_default.cfg
  72. 1 1
      lgsm/config-default/config-lgsm/stserver/_default.cfg
  73. 1 1
      lgsm/config-default/config-lgsm/svenserver/_default.cfg
  74. 1 1
      lgsm/config-default/config-lgsm/terrariaserver/_default.cfg
  75. 1 1
      lgsm/config-default/config-lgsm/tf2server/_default.cfg
  76. 1 1
      lgsm/config-default/config-lgsm/tfcserver/_default.cfg
  77. 1 1
      lgsm/config-default/config-lgsm/ts3server/_default.cfg
  78. 1 1
      lgsm/config-default/config-lgsm/tsserver/_default.cfg
  79. 1 1
      lgsm/config-default/config-lgsm/tuserver/_default.cfg
  80. 1 1
      lgsm/config-default/config-lgsm/twserver/_default.cfg
  81. 1 1
      lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
  82. 1 1
      lgsm/config-default/config-lgsm/ut3server/_default.cfg
  83. 1 1
      lgsm/config-default/config-lgsm/ut99server/_default.cfg
  84. 1 1
      lgsm/config-default/config-lgsm/utserver/_default.cfg
  85. 1 1
      lgsm/config-default/config-lgsm/vsserver/_default.cfg
  86. 1 1
      lgsm/config-default/config-lgsm/wetserver/_default.cfg
  87. 1 1
      lgsm/config-default/config-lgsm/wurmserver/_default.cfg
  88. 1 1
      lgsm/config-default/config-lgsm/zmrserver/_default.cfg
  89. 1 1
      lgsm/config-default/config-lgsm/zpsserver/_default.cfg
  90. 47 21
      lgsm/functions/command_backup.sh

+ 1 - 1
lgsm/config-default/config-lgsm/ahlserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bb2server/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bbserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bdserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bf1942server/_default.cfg

@@ -108,7 +108,7 @@ servercfgdir="${systemdir}/mods/bf1942/settings"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bmdmserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/boserver/_default.cfg

@@ -122,7 +122,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/bsserver/_default.cfg

@@ -133,7 +133,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/btserver/_default.cfg

@@ -116,7 +116,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${lgsmdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ccserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/cod2server/_default.cfg

@@ -111,7 +111,7 @@ servercfgdir="${systemdir}/main"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/cod4server/_default.cfg

@@ -111,7 +111,7 @@ servercfgdir="${systemdir}/main"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/codserver/_default.cfg

@@ -111,7 +111,7 @@ servercfgdir="${systemdir}/main"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/coduoserver/_default.cfg

@@ -111,7 +111,7 @@ servercfgdir="${systemdir}/uo"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/codwawserver/_default.cfg

@@ -111,7 +111,7 @@ servercfgdir="${systemdir}/main"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/csczserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/csserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/cssserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dabserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dmcserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dodserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dodsserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/doiserver/_default.cfg

@@ -126,7 +126,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dstserver/_default.cfg

@@ -134,7 +134,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 servercfgdefault="server.ini"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/dysserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ecoserver/_default.cfg

@@ -112,7 +112,7 @@ servercfgdir="${systemdir}/Configs"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/emserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/etlserver/_default.cfg

@@ -105,7 +105,7 @@ servercfgdir="${systemdir}/etmain"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/fctrserver/_default.cfg

@@ -116,7 +116,7 @@ servercfgdir="${serverfiles}/data"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 gamelogdir="${serverfiles}"

+ 1 - 1
lgsm/config-default/config-lgsm/fofserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/gesserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/gmodserver/_default.cfg

@@ -141,7 +141,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/hldmserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/hldmsserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/hwserver/_default.cfg

@@ -131,7 +131,7 @@ executabledir="${serverfiles}"
 executable=$([ "$(uname -m)" == "x86_64" ] && echo "./Hurtworld.x86_64" || echo "./Hurtworld.x86")
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/insserver/_default.cfg

@@ -131,7 +131,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/iosserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/jc2server/_default.cfg

@@ -116,7 +116,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/jc3server/_default.cfg

@@ -116,7 +116,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/kfserver/_default.cfg

@@ -130,7 +130,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 compressedmapsdir="${rootdir}/Maps-Compressed"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/l4d2server/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/l4dserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/mcserver/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/mtaserver/_default.cfg

@@ -106,7 +106,7 @@ servercfgdir="${systemdir}/mods/deathmatch"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/mumbleserver/_default.cfg

@@ -109,7 +109,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ndserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/nmrihserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ns2cserver/_default.cfg

@@ -130,7 +130,7 @@ servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ns2server/_default.cfg

@@ -134,7 +134,7 @@ servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/nsserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/opforserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/pcserver/_default.cfg

@@ -116,7 +116,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/pzserver/_default.cfg

@@ -119,7 +119,7 @@ servercfgdir="${HOME}/Zomboid/Server"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/q2server/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/q3server/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/qlserver/_default.cfg

@@ -118,7 +118,7 @@ servercfgdir="${serverfiles}/baseq3"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/qwserver/_default.cfg

@@ -109,7 +109,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ricochetserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/roserver/_default.cfg

@@ -126,7 +126,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 compressedmapsdir="${rootdir}/Maps-Compressed"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/rtcwserver/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/rustserver/_default.cfg

@@ -149,7 +149,7 @@ servercfgdir="${serveridentitydir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/rwserver/_default.cfg

@@ -119,7 +119,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/sampserver/_default.cfg

@@ -108,7 +108,7 @@ servercfgdir="${systemdir}/samp03"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/sbotsserver/_default.cfg

@@ -121,7 +121,7 @@ servercfgdir="${systemdir}/blank1/Saved/Config/LinuxServer"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/sbserver/_default.cfg

@@ -122,7 +122,7 @@ servercfgdir="${serverfiles}/storage"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/sfcserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/sof2server/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/solserver/_default.cfg

@@ -110,7 +110,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ss3server/_default.cfg

@@ -120,7 +120,7 @@ servercfgdir="${serverfiles}/Content/SeriousSam3/Config"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/stserver/_default.cfg

@@ -126,7 +126,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/svenserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/terrariaserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/tf2server/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/tfcserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ts3server/_default.cfg

@@ -105,7 +105,7 @@ servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/tsserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/tuserver/_default.cfg

@@ -126,7 +126,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 servercfgdefault="TowerServer.ini"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/twserver/_default.cfg

@@ -123,7 +123,7 @@ servercfgdir="${serverfiles}/tw"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ut2k4server/_default.cfg

@@ -110,7 +110,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 compressedmapsdir="${rootdir}/Maps-Compressed"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ut3server/_default.cfg

@@ -120,7 +120,7 @@ servercfgdir="${systemdir}/UTGame/Config/${servicename}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/ut99server/_default.cfg

@@ -110,7 +110,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 compressedmapsdir="${rootdir}/Maps-Compressed"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/utserver/_default.cfg

@@ -112,7 +112,7 @@ servercfgdir="${systemdir}/UnrealTournament/Saved/Config/LinuxServer"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/vsserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/wetserver/_default.cfg

@@ -105,7 +105,7 @@ servercfgdir="${systemdir}/etmain"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/wurmserver/_default.cfg

@@ -115,7 +115,7 @@ servercfgdir="${systemdir}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/zmrserver/_default.cfg

@@ -124,7 +124,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 1 - 1
lgsm/config-default/config-lgsm/zpsserver/_default.cfg

@@ -129,7 +129,7 @@ servercfgdir="${systemdir}/cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
-backupdir="${rootdir}/backups"
+backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"

+ 47 - 21
lgsm/functions/command_backup.sh

@@ -89,6 +89,31 @@ fn_backup_dir(){
 	fi
 }
 
+# Migrate Backups from old dir before refactor
+fn_backup_migrate_olddir(){
+	# Check if old backup dir is there before the refactor and move the backups
+	if [ -d "${rootdir}/backups" ]; then
+		if [ "${rootdir}/backups" != "${backupdir}" ]; then
+			fn_print_dots "Backup directory is being migrated"
+			fn_script_log_info "Backup directory is being migrated"
+			fn_script_log_info "${rootdir}/backups > ${backupdir}"
+			mv "${rootdir}/backups/"* "${backupdir}" 2>/dev/null
+			exitcode=$?
+			if [ "${exitcode}" -eq 0 ]; then
+				rmdir "${rootdir}/backups" 2>/dev/null
+				exitcode=$?
+			fi
+			if [ "${exitcode}" -eq 0 ]; then
+				fn_print_ok_nl "Backup directory is being migrated"
+				fn_script_log_pass "Backup directory is being migrated"
+			else
+				fn_print_error_nl "Backup directory is being migrated"
+				fn_script_log_error "Backup directory is being migrated"
+			fi
+		fi
+	fi
+}
+
 fn_backup_create_lockfile(){
 	# Create lockfile.
 	date '+%s' > "${tmpdir}/.backup.lock"
@@ -105,7 +130,7 @@ fn_backup_compression(){
 	fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz"
 	fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..."
 	fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress"
-        excludedir=$(fn_backup_relpath)
+	excludedir=$(fn_backup_relpath)
 
 	# Check that excludedir is a valid path.
 	if [ ! -d "${excludedir}" ] ; then
@@ -176,10 +201,10 @@ fn_backup_prune(){
 }
 
 fn_backup_relpath() {
-  	# Written by CedarLUG as a "realpath --relative-to" alternative in bash.
+		# Written by CedarLUG as a "realpath --relative-to" alternative in bash.
 
 	# Populate an array of tokens initialized from the rootdir components.
-  	declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g"))
+		declare -a rdirtoks=($(readlink -f "${rootdir}" | sed "s/\// /g"))
 
 	if [ ${#rdirtoks[@]} -eq 0 ]; then
 		fn_print_fail_nl "Problem assessing rootdir during relative path assessment"
@@ -188,7 +213,7 @@ fn_backup_relpath() {
 	fi
 
 	# Populate an array of tokens initialized from the backupdir components.
-  	declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g"))
+		declare -a bdirtoks=($(readlink -f "${backupdir}" | sed "s/\// /g"))
 	if [ ${#bdirtoks[@]} -eq 0 ]; then
 		fn_print_fail_nl "Problem assessing backupdir during relative path assessment"
 		fn_script_log_fatal "Problem assessing backupdir during relative path assessment: ${rootdir}"
@@ -197,31 +222,31 @@ fn_backup_relpath() {
 
 	# Compare the leading entries of each array.  These common elements will be clipped off.
 	# for the relative path output.
-  	for ((base=0; base<${#rdirtoks[@]}; base++))
-  	do
-      		[[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break
-  	done
+		for ((base=0; base<${#rdirtoks[@]}; base++))
+		do
+			[[ "${rdirtoks[$base]}" != "${bdirtoks[$base]}" ]] && break
+		done
 
 	# Next, climb out of the remaining rootdir location with updir references.
-  	for ((x=base;x<${#rdirtoks[@]};x++))
-  	do
-      		echo -n "../"
-  	done
+		for ((x=base;x<${#rdirtoks[@]};x++))
+		do
+			echo -n "../"
+		done
 
 	# Climb down the remaining components of the backupdir location.
-  	for ((x=base;x<$(( ${#bdirtoks[@]} - 1 ));x++))
-  	do
-      		echo -n "${bdirtoks[$x]}/"
-  	done
+		for ((x=base;x<$(( ${#bdirtoks[@]} - 1 ));x++))
+		do
+					echo -n "${bdirtoks[$x]}/"
+		done
 
 	# In the event there were no directories left in the backupdir above to
 	# traverse down, just add a newline. Otherwise at this point, there is
 	# one remaining directory component in the backupdir to navigate.
-  	if (( "$base" < "${#bdirtoks[@]}" )) ; then
-      		echo "${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]}"
-  	else
-      		echo
-  	fi
+		if (( "$base" < "${#bdirtoks[@]}" )) ; then
+			echo "${bdirtoks[ $(( ${#bdirtoks[@]} - 1)) ]}"
+		else
+			echo
+		fi
 }
 
 # Restart the server if it was stopped for the backup.
@@ -238,6 +263,7 @@ fn_backup_create_lockfile
 fn_backup_init
 fn_backup_stop_server
 fn_backup_dir
+fn_backup_migrate_olddir
 fn_backup_compression
 fn_backup_prune
 fn_backup_start_server