diff --git a/rwx/grub/__init__.py b/rwx/grub/__init__.py index 572b13e..aa208c3 100644 --- a/rwx/grub/__init__.py +++ b/rwx/grub/__init__.py @@ -1,5 +1,7 @@ """Wrap GRUB commands.""" +from __future__ import annotations + from rwx import cmd, ps cmd.need("grub-mkimage") diff --git a/rwx/ps/__init__.py b/rwx/ps/__init__.py index 81d2320..3bef50d 100644 --- a/rwx/ps/__init__.py +++ b/rwx/ps/__init__.py @@ -1,5 +1,7 @@ """Handle processes.""" +from __future__ import annotations + import subprocess from rwx import Object, txt diff --git a/sh/ffmpeg.sh b/sh/ffmpeg.sh index 57f9d21..bcb3a62 100644 --- a/sh/ffmpeg.sh +++ b/sh/ffmpeg.sh @@ -145,6 +145,8 @@ rwx_ffmpeg_output_video_slow() { rwx_ffmpeg_record_hdmi_precision() { local file="${1}" [ -n "${file}" ] || return + # LATER alternative + # shellcheck disable=SC2046,SC2312 set -- \ $(rwx_ffmpeg_input_hdmi) \ $(rwx_ffmpeg_input_dell_precision) \ @@ -158,6 +160,8 @@ rwx_ffmpeg_record_hdmi_precision() { rwx_ffmpeg_record_hdmi_yeti() { local file="${1}" [ -n "${file}" ] || return + # LATER alternative + # shellcheck disable=SC2046,SC2312 set -- \ $(rwx_ffmpeg_input_hdmi) \ $(rwx_ffmpeg_input_blue_yeti) \ @@ -178,6 +182,8 @@ rwx_ffmpeg_reduce() { local from="${3}" local to="${4}" [ -n "${output}" ] || return + # LATER alternative + # shellcheck disable=SC2046,SC2312 set -- \ $(rwx_ffmpeg_input_file "${input}" "${from}" "${to}") \ $(rwx_ffmpeg_output_video_slow) \ diff --git a/sh/lint/lint.sh b/sh/lint/lint.sh index 5448563..365773f 100644 --- a/sh/lint/lint.sh +++ b/sh/lint/lint.sh @@ -1,33 +1,31 @@ # lint code rwx_lint() { local path="${1}" - [ -n "${path}" ] || exit 1 - rwx_lint_clean + [ -n "${path}" ] || return 1 + rwx_lint_clean "${path}" + rwx_lint_tasks "${path}" set \ "python" \ "shell" local code for code in "${@}"; do - rwx_log "${code}" + rwx_log "" "${code}" "rwx_lint_${code}" "${path}" done - rwx_lint_clean + rwx_lint_clean "${path}" } # clean rwx_lint_clean() { local path="${1}" - [ -n "${path}" ] || exit 1 - rwx_log "py3clean" - py3clean \ - --verbose \ - "${path}" + [ -n "${path}" ] || return 1 + rwx_log "" "clean" "" + py3clean "${path}" set \ "mypy" \ "ruff" local tool for tool in "${@}"; do - rwx_log "${tool}" rwx_remove "${path}/.${tool}_cache" done } @@ -42,7 +40,7 @@ rwx_lint_python() { "mypy" \ "ruff" for action in "${@}"; do - rwx_log "${action}" + rwx_log "" "${action}" "rwx_${action}" "${path}" done } @@ -55,7 +53,7 @@ rwx_lint_shell() { "shellcheck" \ "shfmt" for action in "${@}"; do - rwx_log "${action}" + rwx_log "" "${action}" "rwx_${action}" "${path}" done } @@ -69,8 +67,9 @@ rwx_lint_tasks() { "TODO" \ "FIXME" for type in "${@}"; do - rwx_log "${type}" + rwx_log "" "${type}" grep \ + --after "1" \ --directories "recurse" \ --line-number \ " ${type}" \ diff --git a/sh/python.sh b/sh/python.sh new file mode 100644 index 0000000..44ea181 --- /dev/null +++ b/sh/python.sh @@ -0,0 +1,14 @@ +# ╭────────╮ +# │ python │ +# ╰────────╯ + +# ╭────────┬──────╮ +# │ python │ venv │ +# ╰────────┴──────╯ + +rwx_python_venv() { + local path="${1}" + [ -d "${path}" ] || return 1 + export VIRTUAL_ENV="${path}" && \ + export PATH="${VIRTUAL_ENV}/bin:${PATH}" +} diff --git a/sh/rescue/hetzner.sh b/sh/rescue/hetzner.sh index 9d22847..24d6bd0 100644 --- a/sh/rescue/hetzner.sh +++ b/sh/rescue/hetzner.sh @@ -63,6 +63,8 @@ rwx_rescue_wipe_0_init_hetzner_8_8() { for device in "${@}"; do members="${members} ${device}2" done + # LATER alternative + # shellcheck disable=SC2086 rwx_fs_raid_create \ "boot" "00000000:00000000:00000000:00000002" ${members} # @@ -87,6 +89,8 @@ rwx_rescue_wipe_0_init_hetzner_8_8() { for device in "${@}"; do members="${members} ${device}1" done + # LATER alternative + # shellcheck disable=SC2086 rwx_fs_raid_create \ "crypt" "00000000:00000000:00000000:00000001" ${members} # encrypt