diff --git a/TARGETS.sh b/TARGETS.sh index 7e3f354..4ce7ab4 100644 --- a/TARGETS.sh +++ b/TARGETS.sh @@ -24,7 +24,7 @@ ipython:.ipython/profile_default/ipython_config.py gdb:.config/gdb sandbox: chromium:.local/bin/pchromium .local/share/applications/pchromium.desktop -scripts:.local/bin/httpstatus .local/bin/apco .local/bin/bb .local/bin/emoji .local/bin/mksh .local/bin/nato .local/bin/pastas .local/bin/timer .local/bin/tryna .local/bin/trynafail .local/bin/bak .local/bin/cleanup-directory .local/bin/cleanup-directory-log .local/bin/cleanup-downloads .local/bin/gobuild .local/bin/json .local/bin/open .local/bin/py .local/bin/sha .local/bin/showtips .local/bin/weather .local/bin/radio .local/bin/rmt .local/bin/scratch .local/bin/wake .local/bin/myip .local/bin/genpass .local/bin/gensalt .local/bin/django-create-project .local/bin/mirror-site .local/bin/split-file .local/bin/extract .local/bin/destroy .local/bin/serveit .local/bin/highlight-logs %copypasta +scripts:.local/bin/httpstatus .local/bin/apco .local/bin/bb .local/bin/emoji .local/bin/mksh .local/bin/nato .local/bin/pastas .local/bin/timer .local/bin/tryna .local/bin/trynafail .local/bin/bak .local/bin/cleanup-directory .local/bin/cleanup-directory-log .local/bin/cleanup-downloads .local/bin/gobuild .local/bin/json .local/bin/open .local/bin/py .local/bin/sha .local/bin/showtips .local/bin/weather .local/bin/rmt .local/bin/scratch .local/bin/wake .local/bin/myip .local/bin/genpass .local/bin/gensalt .local/bin/django-create-project .local/bin/mirror-site .local/bin/split-file .local/bin/extract .local/bin/destroy .local/bin/serveit .local/bin/highlight-logs %copypasta music:.local/bin/mpv-service.sh .config/systemd/user/mpv.service .local/bin/player copypasta:.local/bin/copy .local/bin/pasta starsector:.java/.userPrefs/com/fs/starfarer/prefs.xml .local/share/applications/starsector.desktop .local/bin/starsector diff --git a/home/user/.local/bin/ga b/home/user/.local/bin/ga index 1422055..a587c49 100755 --- a/home/user/.local/bin/ga +++ b/home/user/.local/bin/ga @@ -5,11 +5,11 @@ _fzf_base() { } fzf_get_selected_modified() { - _fzf_base -1 --border-label=' Modified ' --preview 'git diff --color=always -- "$(echo {+} | sed "s/^[^ ]* //")"' + _fzf_base -1 --border-label=' Modified ' --preview 'git diff --color=always -- "$(echo {} | sed "s/^[^ ]* //")"' } fzf_get_selected_untracked() { - _fzf_base --border-label=' Untracked ' --preview 'highlight -O xterm256 -- "$(echo {+} | sed "s/^[^ ]* //")"' + _fzf_base --border-label=' Untracked ' --preview 'highlight -O xterm256 -- "$(echo {} | sed "s/^[^ ]* //")"' } gitadd() { @@ -21,11 +21,11 @@ git_ls_files() { } modified_files="$(git_ls_files --modified)" -if [ -n "$modified_files" ]; then +if [ -n "${modified_files}" ]; then printf "%s\n" "${modified_files}" | fzf_get_selected_modified | gitadd fi untracked_files="$(git_ls_files --others)" -if [ -n "$untracked_files" ]; then +if [ -n "${untracked_files}" ]; then printf "%s\n" "${untracked_files}" | fzf_get_selected_untracked | gitadd fi diff --git a/home/user/.local/bin/mirror-site b/home/user/.local/bin/mirror-site index 0a8ea6b..7ff2b5a 100755 --- a/home/user/.local/bin/mirror-site +++ b/home/user/.local/bin/mirror-site @@ -1,9 +1,5 @@ #!/bin/sh -eu -readonly name="${1}"; shift - -mkdir -p "${name}" && cd "${name}" - readonly user_agent="Mozilla/5.0 ..." wget \ --page-requisites \ @@ -21,4 +17,4 @@ wget \ --user-agent "${user_agent}" \ --reject '*.woff*,*.ttf,*.eot,*.js' \ --tries 10 \ - "$@" + "${1}" diff --git a/home/user/.local/bin/pchromium b/home/user/.local/bin/pchromium index 0d04437..a8855fc 100755 --- a/home/user/.local/bin/pchromium +++ b/home/user/.local/bin/pchromium @@ -1,11 +1,10 @@ -#!/bin/sh +#!/bin/sh -eu temp_dir="$(mktemp -d)" +trap 'rm -r "${temp_dir}"' EXIT INT HUP chromium \ "--proxy-server=socks5://${SOCKS5_SERVER:-localhost}" \ --user-data-dir="${temp_dir}" \ --new-window \ --proxy-bypass-list='10.0.0.0/8,192.168.0.0/16' - -rm -r "${temp_dir}" diff --git a/home/user/.local/bin/player b/home/user/.local/bin/player index 5e129a2..d701ef8 100755 --- a/home/user/.local/bin/player +++ b/home/user/.local/bin/player @@ -26,6 +26,7 @@ EOF } get_radio_url() { + # https://gist.github.com/ergoz/e7837a54956116167db93b016dbd51a9 channel="${1:-}" case "${channel}" in lofi) echo 'https://radiorecord.hostingradio.ru/lofi96.aacp' ;; diff --git a/home/user/.local/bin/radio b/home/user/.local/bin/radio deleted file mode 100755 index 978a004..0000000 --- a/home/user/.local/bin/radio +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -eu - -channel="${1:-}" - -if [ "${channel}" = lofi ]; then - url='https://radiorecord.hostingradio.ru/lofi96.aacp' -elif [ "${channel}" = fallout ]; then - url='http://fallout.fm:8000/falloutfm1.ogg' -elif [ "${channel}" = wasteland ]; then - url='http://wasteland.su:8080/radio' -elif [ "${channel}" = retrofm ]; then - url='http://hls-01-retro.emgsound.ru/12/128/playlist.m3u8' -elif [ "${channel}" = rusradio ]; then - url='https://rusradio.hostingradio.ru/rusradio128.mp3' -elif [ "${channel}" = rock ]; then - url='https://radiorecord.hostingradio.ru/rock96.aacp' -elif [ "${channel}" = phonk ]; then - url='https://radiorecord.hostingradio.ru/phonk96.aacp' -elif [ "${channel}" = dorognoe ]; then - url='https://dorognoe.hostingradio.ru:8000/dorognoe' -else - echo "don't know \"${channel}\": lofi/fallout/wasteland/retrofm/rusradio/rock/phonk/dorognoe" 1>&2 - exit 1 -fi - -exec mpv --really-quiet "${url}" - -# https://gist.github.com/ergoz/e7837a54956116167db93b016dbd51a9 diff --git a/home/user/.local/bin/tryna b/home/user/.local/bin/tryna index 951b3a9..ac09eb7 100755 --- a/home/user/.local/bin/tryna +++ b/home/user/.local/bin/tryna @@ -1,4 +1,4 @@ -#!/bin/sh -u +#!/bin/sh -eu # Выполнять, пока команда падает while ! "${@}" ; do diff --git a/home/user/.local/bin/trynafail b/home/user/.local/bin/trynafail index c5ec2fe..d022004 100755 --- a/home/user/.local/bin/trynafail +++ b/home/user/.local/bin/trynafail @@ -1,4 +1,4 @@ -#!/bin/sh -u +#!/bin/sh -eu # Выполнять, пока команда не упадет. while "${@}"; do