From b143751f75f5afafd7620b162e5b7b548861b47c Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 4 Nov 2015 04:27:25 +0100 Subject: change media button to use fish scripts wrapped with bash to prevent error if fish is not installed. --- i3/config | 6 +++--- scripts/i3_use_fish.sh | 8 ++++++++ scripts/media_next.fish | 5 +++++ scripts/media_next.sh | 6 ------ scripts/media_prev.fish | 5 +++++ scripts/media_prev.sh | 6 ------ scripts/media_toggle.fish | 5 +++++ scripts/media_toggle.sh | 6 ------ 8 files changed, 26 insertions(+), 21 deletions(-) create mode 100755 scripts/i3_use_fish.sh create mode 100644 scripts/media_next.fish delete mode 100644 scripts/media_next.sh create mode 100644 scripts/media_prev.fish delete mode 100644 scripts/media_prev.sh create mode 100644 scripts/media_toggle.fish delete mode 100644 scripts/media_toggle.sh diff --git a/i3/config b/i3/config index dbe82e6..416d2ae 100644 --- a/i3/config +++ b/i3/config @@ -178,9 +178,9 @@ bindsym XF86AudioLowerVolume exec amixer -q set Master 10%- bindsym XF86AudioRaiseVolume exec amixer -q set Master 10%+ bindsym XF86AudioMute exec amixer -q set Master toggle # # Music -bindsym XF86AudioPrev exec bash ~/.dotfiles/scripts/media_prev.sh -bindsym XF86AudioPlay exec bash ~/.dotfiles/scripts/media_toggle.sh -bindsym XF86AudioNext exec bash ~/.dotfiles/scripts/media_next.sh +bindsym XF86AudioPrev exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_prev.fish" +bindsym XF86AudioPlay exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_toggle.fish" +bindsym XF86AudioNext exec bash -c "~/.dotfiles/scripts/i3_use_fish.sh ~/.dotfiles/scripts/media_next.fish" ## brightnescontroll diff --git a/scripts/i3_use_fish.sh b/scripts/i3_use_fish.sh new file mode 100755 index 0000000..25435fd --- /dev/null +++ b/scripts/i3_use_fish.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if type fish &>/dev/null +then + exec fish $1 +else + exec i3-nagbar -m "please install fish to use this script $1" +fi diff --git a/scripts/media_next.fish b/scripts/media_next.fish new file mode 100644 index 0000000..173d9fc --- /dev/null +++ b/scripts/media_next.fish @@ -0,0 +1,5 @@ +#!/bin/fish + +if type mpc >/dev/null 2>/dev/null + mpc next >/dev/null 2>/dev/null +end diff --git a/scripts/media_next.sh b/scripts/media_next.sh deleted file mode 100644 index 313591b..0000000 --- a/scripts/media_next.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if type mpc &>/dev/null -then - mpc next -fi diff --git a/scripts/media_prev.fish b/scripts/media_prev.fish new file mode 100644 index 0000000..e29bc88 --- /dev/null +++ b/scripts/media_prev.fish @@ -0,0 +1,5 @@ +#!/bin/fish + +if type mpc >/dev/null 2>/dev/null + mpc prev >/dev/null 2>/dev/null +end diff --git a/scripts/media_prev.sh b/scripts/media_prev.sh deleted file mode 100644 index 2379369..0000000 --- a/scripts/media_prev.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if type mpc &>/dev/null -then - mpc prev -fi diff --git a/scripts/media_toggle.fish b/scripts/media_toggle.fish new file mode 100644 index 0000000..e826122 --- /dev/null +++ b/scripts/media_toggle.fish @@ -0,0 +1,5 @@ +#!/bin/fish + +if type mpc >/dev/null 2>/dev/null + mpc toggle >/dev/null 2>/dev/null +end diff --git a/scripts/media_toggle.sh b/scripts/media_toggle.sh deleted file mode 100644 index 755ba54..0000000 --- a/scripts/media_toggle.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if type mpc &>/dev/null -then - mpc toggle -fi -- cgit v1.2.3