diff options
| author | Maria Lisina <sekoohaka.sarisan@gmail.com> | 2024-11-13 13:46:16 +0300 |
|---|---|---|
| committer | Maria Lisina <sekoohaka.sarisan@gmail.com> | 2024-11-13 13:46:16 +0300 |
| commit | ed45b9a3b55b7a4796cbdb065bfab584ba29aedd (patch) | |
| tree | b80811b6aeee0d9cbc3c3dbb8f46a98d58eb306d | |
| parent | f1198a4b4d48ddabe505cd5f1497fa4b32c295e8 (diff) | |
lists: Move lists to their own directory
Signed-off-by: Maria Lisina <sekoohaka.sarisan@gmail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | aliases.sh | 4 | ||||
| -rwxr-xr-x | blacklist.sh | 4 | ||||
| -rwxr-xr-x | bot.sh | 18 | ||||
| -rw-r--r-- | lists/aliases | 0 | ||||
| -rw-r--r-- | lists/blacklist | 2 | ||||
| -rw-r--r-- | lists/whitelist | 0 | ||||
| -rw-r--r-- | units/user.sh | 6 | ||||
| -rwxr-xr-x | whitelist.sh | 4 |
9 files changed, 13 insertions, 26 deletions
@@ -1,2 +1,3 @@ cache config +lists @@ -9,8 +9,8 @@ set -e umask 77 -config="${0%/*}/config" -list="${config}/aliases" +lists="${0%/*}/lists" +list="${lists}/aliases" if [ -n "${1}" ] then diff --git a/blacklist.sh b/blacklist.sh index 24a97fb..a000b56 100755 --- a/blacklist.sh +++ b/blacklist.sh @@ -9,8 +9,8 @@ set -e umask 77 -config="${0%/*}/config" -list="${config}/blacklist" +lists="${0%/*}/lists" +list="${lists}/blacklist" if [ -n "${1}" ] then @@ -13,6 +13,7 @@ version="2.5.2" dir="${0%/*}" cache="${dir}/cache/${$}" config="${dir}/config" +lists="${dir}/lists" modules="${dir}/modules" submodules="${dir}/submodules" units="${dir}/units" @@ -285,23 +286,6 @@ rm -fr "${cache}" mkdir -p "${cache}" mkdir -p "${config}" -if ! [ -f "${config}/blacklist" ] -then - printf "%s\n%s\n" \ - "777000" \ - "1087968824" > "${config}/blacklist" -fi - -if ! [ -f "${config}/whitelist" ] -then - printf "" > "${config}/whitelist" -fi - -if ! [ -f "${config}/aliases" ] -then - printf "" > "${config}/aliases" -fi - echo "PID: ${$}" curl --get \ diff --git a/lists/aliases b/lists/aliases new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lists/aliases diff --git a/lists/blacklist b/lists/blacklist new file mode 100644 index 0000000..3933d67 --- /dev/null +++ b/lists/blacklist @@ -0,0 +1,2 @@ +777000 +1087968824 diff --git a/lists/whitelist b/lists/whitelist new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lists/whitelist diff --git a/units/user.sh b/units/user.sh index efc79dd..69a98d2 100644 --- a/units/user.sh +++ b/units/user.sh @@ -2,9 +2,9 @@ # Copyright (C) 2024 Danil Lisin # SPDX-License-Identifier: Apache-2.0 -aliases="${config}/aliases" -blacklist="${config}/blacklist" -whitelist="${config}/whitelist" +aliases="${lists}/aliases" +blacklist="${lists}/blacklist" +whitelist="${lists}/whitelist" positional_saved="${@}" diff --git a/whitelist.sh b/whitelist.sh index b80f09c..9ea0efb 100755 --- a/whitelist.sh +++ b/whitelist.sh @@ -9,8 +9,8 @@ set -e umask 77 -config="${0%/*}/config" -list="${config}/whitelist" +lists="${0%/*}/lists" +list="${lists}/whitelist" if [ -n "${1}" ] then |