diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | aliases.sh | 4 | ||||
| -rwxr-xr-x | blacklist.sh | 4 | ||||
| -rwxr-xr-x | bot.sh | 14 | ||||
| -rw-r--r-- | files/aliases.txt.default (renamed from lists/aliases.txt.default) | 0 | ||||
| -rw-r--r-- | files/blacklist.txt.default (renamed from lists/blacklist.txt.default) | 0 | ||||
| -rw-r--r-- | files/whitelist.txt.default (renamed from lists/whitelist.txt.default) | 0 | ||||
| -rw-r--r-- | units/user.sh | 6 | ||||
| -rwxr-xr-x | whitelist.sh | 4 |
9 files changed, 17 insertions, 17 deletions
@@ -1,3 +1,3 @@ cache config -lists +files @@ -10,8 +10,8 @@ set -e umask 77 dir="${0%/*}" -lists="${dir}/lists" -list="${lists}/aliases.txt" +files="${dir}/files" +list="${files}/aliases.txt" if [ -n "${1}" ] then diff --git a/blacklist.sh b/blacklist.sh index 997a5d7..ff4da1e 100755 --- a/blacklist.sh +++ b/blacklist.sh @@ -10,8 +10,8 @@ set -e umask 77 dir="${0%/*}" -lists="${dir}/lists" -list="${lists}/blacklist.txt" +files="${dir}/files" +list="${files}/blacklist.txt" if [ -n "${1}" ] then @@ -13,7 +13,7 @@ version="2.8-inadev" dir="${0%/*}" cache="${dir}/cache/${$}" config="${dir}/config" -lists="${dir}/lists" +files="${dir}/files" modules="${dir}/modules" submodules="${dir}/submodules" units="${dir}/units" @@ -286,19 +286,19 @@ rm -fr "${cache}" mkdir -p "${cache}" mkdir -p "${config}" -if ! [ -f "${lists}/aliases.txt" ] +if ! [ -f "${files}/aliases.txt" ] then - cat "${lists}/aliases.txt.default" > "${lists}/aliases.txt" + cat "${files}/aliases.txt.default" > "${files}/aliases.txt" fi -if ! [ -f "${lists}/blacklist.txt" ] +if ! [ -f "${files}/blacklist.txt" ] then - cat "${lists}/blacklist.txt.default" > "${lists}/blacklist.txt" + cat "${files}/blacklist.txt.default" > "${files}/blacklist.txt" fi -if ! [ -f "${lists}/whitelist.txt" ] +if ! [ -f "${files}/whitelist.txt" ] then - cat "${lists}/whitelist.txt.default" > "${lists}/whitelist.txt" + cat "${files}/whitelist.txt.default" > "${files}/whitelist.txt" fi echo "PID: ${$}" diff --git a/lists/aliases.txt.default b/files/aliases.txt.default index e69de29..e69de29 100644 --- a/lists/aliases.txt.default +++ b/files/aliases.txt.default diff --git a/lists/blacklist.txt.default b/files/blacklist.txt.default index 3933d67..3933d67 100644 --- a/lists/blacklist.txt.default +++ b/files/blacklist.txt.default diff --git a/lists/whitelist.txt.default b/files/whitelist.txt.default index e69de29..e69de29 100644 --- a/lists/whitelist.txt.default +++ b/files/whitelist.txt.default diff --git a/units/user.sh b/units/user.sh index 6622c9e..822ea41 100644 --- a/units/user.sh +++ b/units/user.sh @@ -2,9 +2,9 @@ # Copyright (C) 2024-2025 Danil Lisin # SPDX-License-Identifier: Apache-2.0 -aliases="${lists}/aliases.txt" -blacklist="${lists}/blacklist.txt" -whitelist="${lists}/whitelist.txt" +aliases="${files}/aliases.txt" +blacklist="${files}/blacklist.txt" +whitelist="${files}/whitelist.txt" positional_parameters="${@}" diff --git a/whitelist.sh b/whitelist.sh index 67c8c34..335dce7 100755 --- a/whitelist.sh +++ b/whitelist.sh @@ -10,8 +10,8 @@ set -e umask 77 dir="${0%/*}" -lists="${dir}/lists" -list="${lists}/whitelist.txt" +files="${dir}/files" +list="${files}/whitelist.txt" if [ -n "${1}" ] then |