*/*: Refactor cut calls

Signed-off-by: Maria Lisina <sekoohaka.sarisan@gmail.com>

16 files changed, 16 insertions, 16 deletions

diff --git a/aliases.zsh b/aliases.zsh
index 232fc1d..f9f3031 100755
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -157,7 +157,7 @@ case "${action}" in
 
         if alias="$(grep -x "${user_id} .*" "${list}")"
         then
-            alias_id="$(cut -d ' ' -f 2 <<< "${alias}")"
+            alias_id="$(cut -F 2 <<< "${alias}")"
 
             echo "User ID ${user_id} is already aliased to ${alias_id}"
             exit 1
diff --git a/bot.zsh b/bot.zsh
index b24383e..2e81cda 100755
--- a/bot.zsh
+++ b/bot.zsh
@@ -710,7 +710,7 @@ then
 fi
 
 help_line_counter=1
-help_max_line=$(($(grep -c '' <<< "${file_content}" | cut -d ' ' -f 1) + 1))
+help_max_line=$(($(grep -c '' <<< "${file_content}" | cut -F 1) + 1))
 
 until [[ ${help_line_counter} -eq $((help_max_line + 1)) ]]
 do
diff --git a/operators/callback_post.zsh b/operators/callback_post.zsh
index 301001f..3baaebd 100644
--- a/operators/callback_post.zsh
+++ b/operators/callback_post.zsh
@@ -10,7 +10,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/callback_short.zsh b/operators/callback_short.zsh
index 41d8ea2..b68c0a5 100644
--- a/operators/callback_short.zsh
+++ b/operators/callback_short.zsh
@@ -31,7 +31,7 @@ then
     return
 fi
 
-short_hash="$(sha1sum <<< "${short_query}" | cut -d ' ' -f 1)"
+short_hash="$(sha1sum <<< "${short_query}" | cut -F 1)"
 short="${shorts_config}/${short_hash}"
 shorts=($(ls -1 "${shorts_config}"))
 
diff --git a/operators/callback_tags.zsh b/operators/callback_tags.zsh
index a2cda2c..2da0239 100644
--- a/operators/callback_tags.zsh
+++ b/operators/callback_tags.zsh
@@ -10,7 +10,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/command_original.zsh b/operators/command_original.zsh
index 19fdc44..fc72196 100644
--- a/operators/command_original.zsh
+++ b/operators/command_original.zsh
@@ -16,7 +16,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/command_post.zsh b/operators/command_post.zsh
index 2ead112..e92cf9b 100644
--- a/operators/command_post.zsh
+++ b/operators/command_post.zsh
@@ -16,7 +16,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/inline_original.zsh b/operators/inline_original.zsh
index 5e9caac..123c54b 100644
--- a/operators/inline_original.zsh
+++ b/operators/inline_original.zsh
@@ -19,7 +19,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/inline_post.zsh b/operators/inline_post.zsh
index 92d7199..a6a76cb 100644
--- a/operators/inline_post.zsh
+++ b/operators/inline_post.zsh
@@ -19,7 +19,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/inline_search.zsh b/operators/inline_search.zsh
index f32f456..105488e 100644
--- a/operators/inline_search.zsh
+++ b/operators/inline_search.zsh
@@ -59,7 +59,7 @@ then
     return
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_mode}${ib_board}${ib_page}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_mode}${ib_board}${ib_page}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/operators/url_parser.zsh b/operators/url_parser.zsh
index 050ce21..f18542a 100644
--- a/operators/url_parser.zsh
+++ b/operators/url_parser.zsh
@@ -52,7 +52,7 @@ else
     ib_query="id:${ib_post_id}"
 fi
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/units/ib_cache.zsh b/units/ib_cache.zsh
index ac8b706..6ab884c 100644
--- a/units/ib_cache.zsh
+++ b/units/ib_cache.zsh
@@ -5,7 +5,7 @@
 ib_post="$(jq -c ".[$((idx - 1))]" "${ib_file}")"
 ib_query="id:${ib_id}"
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/units/ib_hash.zsh b/units/ib_hash.zsh
index ade76fd..a9b4ff6 100644
--- a/units/ib_hash.zsh
+++ b/units/ib_hash.zsh
@@ -10,7 +10,7 @@ source "${units}/ib_authconfig.zsh"
 
 ib_query="md5:${ib_post_md5}"
 
-ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -d ' ' -f 1)"
+ib_hash="$(sha1sum <<< "${user_id}${ib_board}${ib_query}" | cut -F 1)"
 ib_file="${cache}/${ib_hash}.json"
 
 until mkdir "${cache}/${ib_hash}.lock"
diff --git a/units/ib_name.zsh b/units/ib_name.zsh
index 13d901f..808029f 100644
--- a/units/ib_name.zsh
+++ b/units/ib_name.zsh
@@ -36,7 +36,7 @@ do
     fi
 done
 
-ib_post_id="$(sed '2!d' <<< "${reply_text}" | cut -d ' ' -f 2)"
+ib_post_id="$(sed '2!d' <<< "${reply_text}" | cut -F 2)"
 
 if [[ -z "${ib_post_id}" ]]
 then
diff --git a/units/ib_post.zsh b/units/ib_post.zsh
index 7580bde..414d163 100644
--- a/units/ib_post.zsh
+++ b/units/ib_post.zsh
@@ -75,7 +75,7 @@ if [[ -n "${ib_source}" && "${ib_source}" != "null" ]]
 then
     if grep -q -e "pixiv" -e "pximg" <<< "${ib_source}"
     then
-        ib_source="https://www.pixiv.net/artworks/$(cut -d '_' -f 1 <<< "${ib_source##*/}")"
+        ib_source="https://www.pixiv.net/artworks/$(cut -d "[._]" -F 1 <<< "${ib_source##*/}")"
     fi
 
     if [[ ${#ib_source} -le 1024 ]]
diff --git a/units/user.zsh b/units/user.zsh
index bbd82a4..90de78f 100644
--- a/units/user.zsh
+++ b/units/user.zsh
@@ -10,7 +10,7 @@ target_user="${user_id}"
 
 if [[ -s "${aliases_list}" ]] && alias="$(grep -x "${user_id} .*" "${aliases_list}")"
 then
-    user_id="$(cut -d ' ' -f 2 <<< "${alias}")"
+    user_id="$(cut -F 2 <<< "${alias}")"
 fi
 
 if [[ -s "${blacklist_list}" ]] && grep -qx "${user_id}" "${blacklist_list}"