reachable-watcher 1.0.111 → 1.0.113

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/reachable-watcher.sh +7 -13
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "reachable-watcher",
3
- "version": "1.0.111",
3
+ "version": "1.0.113",
4
4
  "license": "CC-BY-3.0",
5
5
  "description": "Check status codes of web servers and sends notification e-mails",
6
6
  "homepage": "https://torben.website/reachable-watcher",
package/reachable-watcher.sh CHANGED
@@ -33,15 +33,7 @@ elif [ -f "/usr/lib/bashlink/module.sh" ]; then
33
33
  # shellcheck disable=SC1091
34
34
  source "/usr/lib/bashlink/module.sh"
35
35
  else
36
- declare -g RW_CACHE_PATH="$(
37
- echo "$@" | \
38
- sed \
39
- --regexp-extended \
40
- 's/(^| )(-o|--cache-path)(=| +)(.+[^ ])($| +-)/\4/'
41
- )"
42
- [ "$RW_CACHE_PATH" = "$*" ] && \
43
- RW_CACHE_PATH=reachableWatcherInstallCache
44
- RW_CACHE_PATH="${RW_CACHE_PATH%/}/"
36
+ declare -g RW_CACHE_PATH=/tmp/reachableWatcherInstallCache/
45
37
  declare -gr BL_MODULE_REMOTE_MODULE_CACHE_PATH="${RW_CACHE_PATH}bashlink"
46
38
  mkdir --parents "$BL_MODULE_REMOTE_MODULE_CACHE_PATH"
47
39
  declare -gr BL_MODULE_RETRIEVE_REMOTE_MODULES=true
@@ -289,20 +281,22 @@ if bl.tools.is_main; then
289
281
  bl.exception.try
290
282
  rw.main "$@"
291
283
  bl.exception.catch_single
284
+ # region clean up
292
285
  {
293
- [ -d "$RW_BASHLINK_PATH" ] && \
294
- rm --recursive "$RW_BASHLINK_PATH"
286
+ [ -f "$BL_MODULE_NAME_RESOLVING_CACHE_FILE_PATH" ] && \
287
+ rm "$BL_MODULE_NAME_RESOLVING_CACHE_FILE_PATH"
295
288
  # shellcheck disable=SC2154
296
289
  [ -d "$BL_MODULE_REMOTE_MODULE_CACHE_PATH" ] && \
297
290
  rm --recursive "$BL_MODULE_REMOTE_MODULE_CACHE_PATH"
298
291
  # shellcheck disable=SC2154
299
292
  bl.logging.error "$BL_EXCEPTION_LAST_TRACEBACK"
300
293
  }
301
- [ -d "$RW_BASHLINK_PATH" ] && \
302
- rm --recursive "$RW_BASHLINK_PATH"
294
+ [ -f "$BL_MODULE_NAME_RESOLVING_CACHE_FILE_PATH" ] && \
295
+ rm "$BL_MODULE_NAME_RESOLVING_CACHE_FILE_PATH"
303
296
  # shellcheck disable=SC2154
304
297
  [ -d "$BL_MODULE_REMOTE_MODULE_CACHE_PATH" ] && \
305
298
  rm --recursive "$BL_MODULE_REMOTE_MODULE_CACHE_PATH"
299
+ # endregion
306
300
  fi
307
301
  # region vim modline
308
302
  # vim: set tabstop=4 shiftwidth=4 expandtab: