Skip to content

Commit 2af93ff

Browse files
committed
error checking, mplayer installed
1 parent a04cb1c commit 2af93ff

File tree

3 files changed

+386
-21
lines changed

3 files changed

+386
-21
lines changed

smoke/lib/config.sh

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,63 @@
11
#!/bin/bash
22

33
mplayer_config() {
4-
mplayerconf="~/.mplayer/config"
5-
echo "
4+
mplayerconf="$HOME/.mplayer/config"
5+
echo "
66
prefer-ipv4 = yes
77
nolirc= yes
8-
really-quiet= 1
9-
" >> $mplayerconf
8+
really-quiet= 1" >> $mplayerconf
109
}
1110

1211
get_os() {
1312
. /etc/os-release
1413
OS=$NAME
1514
}
1615

16+
check_root() {
17+
if [ "$(id -u)" != "0" ]
18+
then
19+
echo "This script must be run as root" 1>&2
20+
exit 1
21+
fi
22+
}
23+
24+
install_mplayer() {
25+
#check_root
26+
echo "Installing"
27+
sleep 1
28+
case $OS in
29+
Fedora)
30+
sudo yum install mplayer -y > /dev/null
31+
;;
32+
Ubuntu)
33+
sudo apt-get install mplayer -y > /dev/null
34+
;;
35+
esac
36+
37+
if [ $? = "0" ]
38+
then echo "SUCCESS: Installed"
39+
else echo "ERROR: Install Failed"
40+
fi
41+
}
1742

1843
check_mplayer() {
1944
get_os
2045
MPLAYER="/bin/mplayer"
2146
if [ ! -e $MPLAYER ]
22-
then echo "Mplayer is not installed!"
23-
sleep 1
24-
echo "Installing"
25-
sleep 1
26-
case $OS in
27-
28-
Fedora)
29-
sudo yum install mplayer -y > /dev/null
30-
;;
31-
Ubuntu)
32-
sudo apt-get install mplayer -y > /dev/null
33-
;;
47+
then read -p "Mplayer is not installed! (y/n) [Default:y]" install_response
48+
case $install_response in
49+
y)
50+
install_mplayer
51+
;;
52+
n)
53+
echo "Mplayer is required, exiting."
54+
exit 1
55+
;;
56+
*)
57+
install_mplayer
58+
;;
3459
esac
3560

36-
if [ $? = "0" ]
37-
then echo "SUCCESS: Installed"
38-
else echo "ERROR: Install Failed"
39-
fi
40-
4161
if [ -f $mplayerconf ]
4262
then echo "Configuring Mplayer."
4363
mplayer_config

smoke/lib/tracks.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
4. http://www.youtube.com/watch?v=DW-Tg8315uM - Afroman - Colt 45
55
5. http://www.youtube.com/watch?v=Ls4qXjZtZXI - Afroman - Because I got High (Explicit Version)
66
6. http://www.youtube.com/watch?v=JXIUIFI1gWk - Snoop Dogg - Smokin' Smokin' Weed
7+
7. http://www.youtube.com/watch?v=o5duTvjLANA - Snoop Dogg ft. Wiz Khalifa - That Good

0 commit comments

Comments
 (0)