Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: no-detach detatching #1274

Merged
merged 21 commits into from
Mar 22, 2024
Merged

fix: no-detach detatching #1274

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
90ee38a
fix: no-detach was incomplete
port19x Feb 4, 2024
9b04f12
try to appease shellcheck
port19x Feb 4, 2024
a1b3bd0
odd...
port19x Feb 4, 2024
2a84d57
like this maybe?
port19x Feb 4, 2024
955b8cf
bob'n'weave
port19x Feb 4, 2024
b11a200
jklö
port19x Feb 4, 2024
210d11c
back to intended state, possibly raise issue @shellcheck
port19x Feb 4, 2024
696d8e2
only redirect to /dev/null when not no_detach
port19x Feb 8, 2024
3085919
Merge branch 'master' into fix-nodetach
port19x Feb 8, 2024
ff924ab
do a shellcheck disable on the no_detach feature-line
port19x Feb 8, 2024
0471434
multi-line mpv case due to primitive shellcheck parsing
port19x Feb 8, 2024
6b3a937
misspelled `shellcheck disable`
port19x Feb 8, 2024
f0280fb
add temp line to trigger github ci :angry:
port19x Feb 8, 2024
c1f83b5
shellcheck is killing me
port19x Feb 8, 2024
fd57b9c
now?
port19x Feb 8, 2024
3c9888e
fix trailing spaces
port19x Feb 8, 2024
4917eb2
add trailing whitespace to trigger ci run
port19x Mar 21, 2024
cfb1e58
another one
port19x Mar 21, 2024
06d1be1
Merge branch 'master' into fix-nodetach
port19x Mar 21, 2024
1e877d2
aight, I give up, if-else it is
port19x Mar 21, 2024
297db84
silly me, forgetting space before ]
port19x Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ani-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

version_number="4.8.1"
version_number="4.8.2"

# UI

Expand Down Expand Up @@ -247,7 +247,13 @@ play_episode() {
[ -z "$ANI_CLI_NON_INTERACTIVE" ] && printf "All links:\n%s\nSelected link:\n" "$links"
printf "%s\n" "$episode"
;;
mpv*) $([ "$no_detach" = 0 ] && echo "nohup") "$player_function" $skip_flag --force-media-title="${allanime_title}Episode ${ep_no}" "$episode" >/dev/null 2>&1 & ;;
mpv*)
if [ "$no_detach" = 0 ]; then
nohup "$player_function" $skip_flag --force-media-title="${allanime_title}Episode ${ep_no}" "$episode" >/dev/null 2>&1 &
else
"$player_function" $skip_flag --force-media-title="${allanime_title}Episode ${ep_no}" "$episode"
fi
;;
android_mpv) nohup am start --user 0 -a android.intent.action.VIEW -d "$episode" -n is.xyz.mpv/.MPVActivity >/dev/null 2>&1 & ;;
android_vlc) nohup am start --user 0 -a android.intent.action.VIEW -d "$episode" -n org.videolan.vlc/org.videolan.vlc.gui.video.VideoPlayerActivity -e "title" "${allanime_title}Episode ${ep_no}" >/dev/null 2>&1 & ;;
iina) nohup "$player_function" --no-stdin --keep-running --mpv-force-media-title="${allanime_title}Episode ${ep_no}" "$episode" >/dev/null 2>&1 & ;;
Expand Down
Loading