From 67286c69d03c9f34370bf97a943c8e8b77882634 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 14:49:06 -0700
Subject: [PATCH 01/33] Changed README to reflect redhat and fedora

---
 README.mkdn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.mkdn b/README.mkdn
index e723d1e..a59a800 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -1,4 +1,4 @@
-Swordrune10's Debian/Ubuntu Scripts
+Swordrune10's Redhat/Fedora Scripts
 -------------------------
 
 

From 9aa5feead9884bccf1c1594195e5e78755c14e05 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 15:52:19 -0700
Subject: [PATCH 02/33] update: convert to fedora

---
 app/update | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/update b/app/update
index 3ffe4e6..944e76d 100755
--- a/app/update
+++ b/app/update
@@ -13,7 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo apt-get update
-sudo apt-get --allow-unauthenticated dist-upgrade
-sudo apt-get autoclean
-sudo apt-get autoremove
+sudo yum update
+sudo yum clean all

From f6276d7965e54d308500609d44a7c3c2f7ee9218 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:09:27 -0700
Subject: [PATCH 03/33] setupbin: change to elif to make sure it doesnt patch
 if its already there

---
 setupbin | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setupbin b/setupbin
index 325dfd5..78fb2d3 100755
--- a/setupbin
+++ b/setupbin
@@ -16,8 +16,7 @@
 cd ~
 if ( grep -q HOME/bin/android .profile );then
 	echo ".profile doesn't need to be patched"
-fi
-if ( ! grep -q HOME/bin/android .profile )  && ( find $HOME/bin/private &> /dev/null );then
+elif ( ! grep -q HOME/bin/android .profile )  && ( find $HOME/bin/private &> /dev/null );then
 	sed -i '/PATH"/ a\    PATH="$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server:$PATH"' .profile
 	echo "patched .profile"
 else

From ebdbda123b0365daae413e4b90a7332637ab7035 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:15:38 -0700
Subject: [PATCH 04/33] setupbin: convert to fedora

---
 setupbin | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setupbin b/setupbin
index 78fb2d3..92aefb3 100755
--- a/setupbin
+++ b/setupbin
@@ -14,12 +14,12 @@
 # limitations under the License.
 
 cd ~
-if ( grep -q HOME/bin/android .profile );then
+if ( grep -q HOME/bin/android .bash_profile );then
 	echo ".profile doesn't need to be patched"
-elif ( ! grep -q HOME/bin/android .profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH"/ a\    PATH="$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server:$PATH"' .profile
+elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
+	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .profile
 	echo "patched .profile"
 else
-	sed -i '/PATH"/ a\    PATH="$HOME/bin/android:$HOME/bin/app:$HOME/bin/server:$PATH"' .profile
+	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .profile
 	echo "patched .profile"
 fi

From f419fe1511053789cd515a794891e993cd24260d Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:17:37 -0700
Subject: [PATCH 05/33] setupbin: convert derp

---
 setupbin | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setupbin b/setupbin
index 92aefb3..a9e9993 100755
--- a/setupbin
+++ b/setupbin
@@ -15,11 +15,11 @@
 
 cd ~
 if ( grep -q HOME/bin/android .bash_profile );then
-	echo ".profile doesn't need to be patched"
+	echo ".bash_profile doesn't need to be patched"
 elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .profile
-	echo "patched .profile"
+	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
+	echo "patched .bash_profile"
 else
-	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .profile
-	echo "patched .profile"
+	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
+	echo "patched .bash_profile"
 fi

From 4ca619fcf3dad97156bb8707d0227b8269d9ffa9 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:27:48 -0700
Subject: [PATCH 06/33] setupbin: edit sed to hopefully append right

---
 setupbin | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setupbin b/setupbin
index a9e9993..a05a284 100755
--- a/setupbin
+++ b/setupbin
@@ -17,9 +17,9 @@ cd ~
 if ( grep -q HOME/bin/android .bash_profile );then
 	echo ".bash_profile doesn't need to be patched"
 elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH="/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 else
-	sed -i '/PATH"/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH="/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 fi

From 48f6fcab6fcd03a66921e11bc0acdad464a168fa Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:31:04 -0700
Subject: [PATCH 07/33] setupbin: remove spacing and second try to fix append

---
 setupbin | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setupbin b/setupbin
index a05a284..2095e31 100755
--- a/setupbin
+++ b/setupbin
@@ -17,9 +17,9 @@ cd ~
 if ( grep -q HOME/bin/android .bash_profile );then
 	echo ".bash_profile doesn't need to be patched"
 elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH="/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH=/ a\ PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 else
-	sed -i '/PATH="/ a\    PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH=/ a\ PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 fi

From b8d4bffe232278c77e6dfce00293b5fdd14ffe6d Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:34:17 -0700
Subject: [PATCH 08/33] setupbin: left one space to append

---
 setupbin | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setupbin b/setupbin
index 2095e31..3543600 100755
--- a/setupbin
+++ b/setupbin
@@ -17,9 +17,9 @@ cd ~
 if ( grep -q HOME/bin/android .bash_profile );then
 	echo ".bash_profile doesn't need to be patched"
 elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH=/ a\ PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH=/ a\PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 else
-	sed -i '/PATH=/ a\ PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH=/ a\PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
 	echo "patched .bash_profile"
 fi

From 508e7f96482d60093088acae4ce0c4cfb8e1e11f Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:36:46 -0700
Subject: [PATCH 09/33] addpkg: convert to fedora

---
 app/addpkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/addpkg b/app/addpkg
index 310e501..a1da332 100755
--- a/app/addpkg
+++ b/app/addpkg
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo apt-get install $@
+sudo yum install $@

From 5a2574a444d3206fa43c9516ba1db13da1a4ea60 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:41:23 -0700
Subject: [PATCH 10/33] update: add missing piece

---
 app/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/update b/app/update
index 944e76d..842c459 100755
--- a/app/update
+++ b/app/update
@@ -14,4 +14,5 @@
 # limitations under the License.
 
 sudo yum update
+sudo yum upgrade
 sudo yum clean all

From 0dc5535c78ee8da4db8dd1c3bcde3a3b70ae1bb7 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:46:09 -0700
Subject: [PATCH 11/33] update: confused commands are confused

---
 app/update | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/update b/app/update
index 842c459..d6fc7bf 100755
--- a/app/update
+++ b/app/update
@@ -13,6 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo yum update
 sudo yum upgrade
 sudo yum clean all

From 0ba0931dbe5b7fae67805dc51999536e1c53f076 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 16:50:26 -0700
Subject: [PATCH 12/33] addrepo: convert to fedora

---
 app/addrepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/addrepo b/app/addrepo
index 4f2cb18..7546651 100755
--- a/app/addrepo
+++ b/app/addrepo
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo add-apt-repository "$@"
+sudo yum-config-manager --add-repo "$@"

From 9289c90262564e75c40af7c975560f5a8a161672 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 17:11:46 -0700
Subject: [PATCH 13/33] Add addrpmfusion

---
 app/addrpmfusion | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 app/addrpmfusion

diff --git a/app/addrpmfusion b/app/addrpmfusion
new file mode 100755
index 0000000..ab10687
--- /dev/null
+++ b/app/addrpmfusion
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Copyright (C) 2014 Sean Donovan
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#    http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm

From 53b5e370ad213f6b2fce956bd46ceaff12110575 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 25 Apr 2014 17:18:52 -0700
Subject: [PATCH 14/33] update: yum clean cleans too much

---
 app/update | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/update b/app/update
index d6fc7bf..446572a 100755
--- a/app/update
+++ b/app/update
@@ -14,4 +14,3 @@
 # limitations under the License.
 
 sudo yum upgrade
-sudo yum clean all

From 1f735b1844eea89c4040bbcc48eab0c3e7aac909 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 16:44:45 -0700
Subject: [PATCH 15/33] removepkg: convert to fedora

---
 app/removepkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/removepkg b/app/removepkg
index 400be4d..43bc915 100755
--- a/app/removepkg
+++ b/app/removepkg
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo apt-get remove $@
+sudo yum remove $@

From f6e78d14d05f750e9b49f0526071dda03724229c Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 16:55:32 -0700
Subject: [PATCH 16/33] removerepo: kinda sorta convert to fedora

---
 app/removerepo | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/removerepo b/app/removerepo
index 7177855..48c9852 100755
--- a/app/removerepo
+++ b/app/removerepo
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo add-apt-repository --remove "$@"
+cd /etc/yum.repos.d
+sudo rm -rf "$@"

From 057fcc064ab1315c5118ccdfe967a745755c46b2 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 16:58:30 -0700
Subject: [PATCH 17/33] torrentmaker: convert to fedora

---
 app/torrentmaker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/torrentmaker b/app/torrentmaker
index 85102f6..48f9769 100755
--- a/app/torrentmaker
+++ b/app/torrentmaker
@@ -23,7 +23,7 @@ if [ ! "$needsinstall" ]; then
 	echo "All prerequisites are already installed"
 else
 	echo "A prerequisites needs to be installed"
-	sudo apt-get install $needsinstall
+	sudo yum install $needsinstall
 fi
 
 echo "You want to make a webseeder?"

From bad9c8f3fbb464fb4a323586beb1fa4d47f7e30e Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 17:01:46 -0700
Subject: [PATCH 18/33] limitbandwidth: convert to fedora

---
 server/limitbandwidth | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/limitbandwidth b/server/limitbandwidth
index b953249..c3b03b0 100755
--- a/server/limitbandwidth
+++ b/server/limitbandwidth
@@ -23,7 +23,7 @@ if [ ! "$needsinstall" ]; then
 	echo "All prerequisites are already installed"
 else
 	echo "A prerequisites needs to be installed"
-	sudo apt-get install $needsinstall
+	sudo yum install $needsinstall
 fi
 
 if [ "$1" == "clear" ]; then

From df1bb5807deb5b5175c49136819c721d5d17024f Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 17:06:27 -0700
Subject: [PATCH 19/33] restartapache: convert to fedora

---
 server/restartapache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/restartapache b/server/restartapache
index dde5a28..c1e7273 100755
--- a/server/restartapache
+++ b/server/restartapache
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo /etc/init.d/apache2 restart
+sudo service httpd restart

From 9ec2427be2cf074d5f9b876f4ac307856823e3d4 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 17:11:11 -0700
Subject: [PATCH 20/33] Remove Ubuntu files

---
 server/ubuonestop | 16 ----------------
 server/ubuonesync | 16 ----------------
 2 files changed, 32 deletions(-)
 delete mode 100755 server/ubuonestop
 delete mode 100755 server/ubuonesync

diff --git a/server/ubuonestop b/server/ubuonestop
deleted file mode 100755
index f90b36a..0000000
--- a/server/ubuonestop
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2014 Sean Donovan
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-#    http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-u1sdtool --quit
diff --git a/server/ubuonesync b/server/ubuonesync
deleted file mode 100755
index 00f1786..0000000
--- a/server/ubuonesync
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2014 Sean Donovan
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-#    http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-watch -n .1 u1sdtool --current-transfers

From fb1ed9b535366f55f68df4a0122eae30bf1a654c Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sat, 26 Apr 2014 17:18:29 -0700
Subject: [PATCH 21/33] Add setuplamp

---
 server/setuplamp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 server/setuplamp

diff --git a/server/setuplamp b/server/setuplamp
new file mode 100755
index 0000000..b1c954b
--- /dev/null
+++ b/server/setuplamp
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Copyright (C) 2014 Sean Donovan
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#    http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sudo yum install httpd mysql mysql-server php php-mysql
+
+sudo /usr/bin/mysql_secure_installation
+
+sudo service httpd start
+sudo service mysqld start
+
+sudo chkconfig httpd on
+sudo chkconfig mysqld on

From 17a61d061fa2d32d4d7cdc06c95baf8d4c279729 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 17:20:33 -0700
Subject: [PATCH 22/33] Update mkdvd to use less programs

---
 app/mkdvd | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/mkdvd b/app/mkdvd
index 69c92f0..6c42e13 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -14,16 +14,9 @@
 # limitations under the License.
 
 echo "Checking if prerequisites are installed"
-for f in `echo mplayer` `echo movie-to-dvd` `echo dvdauthor` `echo genisoimage` `echo libxvidcore4`
+for f in `echo libav-tools` `echo dvdauthor` `echo genisoimage`
 do
-	if [ $f == "libxvidcore4" ]; then
-		if ( ! locate libxvidcore4 &> /dev/null ); then
-			needsinstall="$needsinstall $f"
-		fi
-	elif ( ! type -a $f &> /dev/null ); then
-		if [ $f == "movie-to-dvd" ]; then
-			f="videotrans"
-		fi
+	if ( ! type -a $f &> /dev/null ); then
 		needsinstall="$needsinstall $f"
 	fi
 done
@@ -41,10 +34,10 @@ read videostandard
 
 if [ $videostandard == "NTSC" ] || [ $videostandard == "ntsc" ]; then
 	export VIDEO_FORMAT=NTSC
-	movietodvdstandard=ntsc
+	movietodvdstandard=ntsc-dvd
 elif [ $videostandard == "PAL" ] || [ $videostandard == "pal" ]; then
 	export VIDEO_FORMAT=PAL
-	movietodvdstandard=pal
+	movietodvdstandard=pal-dvd
 else
 	echo "You did not type in the correct response! try again.."
 	echo ""
@@ -66,9 +59,7 @@ cd "$whereisvideo"/temp
 
 movietitle=$(echo "$moviefile" | sed s/\.[^\.]*$//)
 
-movie-to-dvd -m $movietodvdstandard -o . ../"$moviefile"
-
-mplex -f 8 -o "$movietitle".mpg "$movietitle".m2v "$movietitle".ac3
+avconv -i ../"$moviefile" -qscale 1 -target $movietodvdstandard "$movietitle".mpg
 
 dvdauthor -o dvd/ -t "$movietitle".mpg
 

From 21848c158595b839e2f22d65302b5403ab9130df Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 17:27:29 -0700
Subject: [PATCH 23/33] mkdvd: fix avconv check

---
 app/mkdvd | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/mkdvd b/app/mkdvd
index 6c42e13..7e43ac8 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -14,9 +14,12 @@
 # limitations under the License.
 
 echo "Checking if prerequisites are installed"
-for f in `echo libav-tools` `echo dvdauthor` `echo genisoimage`
+for f in `echo avconv` `echo dvdauthor` `echo genisoimage`
 do
 	if ( ! type -a $f &> /dev/null ); then
+		if [ $f == "avconv" ]; then
+			f="libav-tools"
+		fi
 		needsinstall="$needsinstall $f"
 	fi
 done

From f6241df39d538ff585d6ae0a9d47d0f8fc2e099d Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 17:37:59 -0700
Subject: [PATCH 24/33] mkdvd: add video scaling to auto select aspect

---
 app/mkdvd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mkdvd b/app/mkdvd
index 7e43ac8..512b9a8 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -62,7 +62,7 @@ cd "$whereisvideo"/temp
 
 movietitle=$(echo "$moviefile" | sed s/\.[^\.]*$//)
 
-avconv -i ../"$moviefile" -qscale 1 -target $movietodvdstandard "$movietitle".mpg
+avconv -i ../"$moviefile" -qscale 1 -vf "scale=640:-1" -target $movietodvdstandard "$movietitle".mpg
 
 dvdauthor -o dvd/ -t "$movietitle".mpg
 

From 86a0cc6200a1e9eadba3f0c27cac4f3c0272a92d Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 19:34:43 -0700
Subject: [PATCH 25/33] mkdvd: add ffmpeg/avconv repo since 14.04 avconv is
 stuttery

---
 app/mkdvd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/mkdvd b/app/mkdvd
index 512b9a8..9cab34c 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -27,7 +27,11 @@ done
 if [ ! "$needsinstall" ]; then
 	echo "All prerequisites are already installed"
 else
+	echo "Adding necessary repo"
+	addrepo ppa:jon-severinsson/ffmpeg
+
 	echo "Some prerequisites needs to be installed"
+	sudo apt-get update
 	sudo apt-get install $needsinstall
 fi
 

From fd40fe3b1e47e42332299e1ecc87f2765f8439b0 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 19:56:24 -0700
Subject: [PATCH 26/33] mkdvd: convert to fedora

---
 app/mkdvd | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/mkdvd b/app/mkdvd
index 9cab34c..802a79c 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -14,12 +14,9 @@
 # limitations under the License.
 
 echo "Checking if prerequisites are installed"
-for f in `echo avconv` `echo dvdauthor` `echo genisoimage`
+for f in `echo ffmpeg` `echo dvdauthor` `echo genisoimage`
 do
 	if ( ! type -a $f &> /dev/null ); then
-		if [ $f == "avconv" ]; then
-			f="libav-tools"
-		fi
 		needsinstall="$needsinstall $f"
 	fi
 done
@@ -28,11 +25,10 @@ if [ ! "$needsinstall" ]; then
 	echo "All prerequisites are already installed"
 else
 	echo "Adding necessary repo"
-	addrepo ppa:jon-severinsson/ffmpeg
+	addrpmfusion
 
 	echo "Some prerequisites needs to be installed"
-	sudo apt-get update
-	sudo apt-get install $needsinstall
+	sudo yum install $needsinstall
 fi
 
 videostandard () {

From b4e3ec90e1d8aa918d5ef55e6da7e88467129b8d Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 19:58:45 -0700
Subject: [PATCH 27/33] mkdvd: silly derp

---
 app/mkdvd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mkdvd b/app/mkdvd
index 802a79c..80c9a7a 100755
--- a/app/mkdvd
+++ b/app/mkdvd
@@ -62,7 +62,7 @@ cd "$whereisvideo"/temp
 
 movietitle=$(echo "$moviefile" | sed s/\.[^\.]*$//)
 
-avconv -i ../"$moviefile" -qscale 1 -vf "scale=640:-1" -target $movietodvdstandard "$movietitle".mpg
+ffmpeg -i ../"$moviefile" -qscale 1 -vf "scale=640:-1" -target $movietodvdstandard "$movietitle".mpg
 
 dvdauthor -o dvd/ -t "$movietitle".mpg
 

From cede93e4e328308571b28bc20a32dd8d3bd6db20 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Sun, 27 Apr 2014 20:18:25 -0700
Subject: [PATCH 28/33] addrpmfusion: add checks to see if installed or not

---
 app/addrpmfusion | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/addrpmfusion b/app/addrpmfusion
index ab10687..abd947e 100755
--- a/app/addrpmfusion
+++ b/app/addrpmfusion
@@ -13,5 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+yumrepo=$(echo "/etc/yum.repos.d")
+
+if ( find $yumrepo/rpmfusion-free.repo -maxdepth 1 &> /dev/null); then
+	echo "rpmfusion free already installed!"
+else
+	echo "installing rpmfusion free"
+	sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+fi
+
+if ( find $yumrepo/rpmfusion-nonfree.repo -maxdepth 1 &> /dev/null); then
+	echo "rpmfusion nonfree already installed!"
+else
+	echo "installing rpmfusion nonfree"
+	sudo yum localinstall --nogpgcheck http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+fi

From 3fcfa5ca243ae57dd4ca93f6fd6fa23e53bc9a63 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Tue, 3 Jun 2014 14:06:48 -0700
Subject: [PATCH 29/33] setupbin: Updated private folder setup

---
 setupbin | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setupbin b/setupbin
index 3543600..2679858 100755
--- a/setupbin
+++ b/setupbin
@@ -13,13 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cd ~
-if ( grep -q HOME/bin/android .bash_profile );then
+if ( grep -q HOME/bin/android $HOME/.bash_profile ); then
 	echo ".bash_profile doesn't need to be patched"
-elif ( ! grep -q HOME/bin/android .bash_profile )  && ( find $HOME/bin/private &> /dev/null );then
-	sed -i '/PATH=/ a\PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/private:$HOME/bin/server"' .bash_profile
-	echo "patched .bash_profile"
 else
-	sed -i '/PATH=/ a\PATH="$PATH:$HOME/bin/android:$HOME/bin/app:$HOME/bin/server"' .bash_profile
+	sed -i '/PATH"/ a\    PATH="$HOME/bin/android:$HOME/bin/app:$HOME/bin/server:$PATH"' $HOME/.bash_profile
 	echo "patched .bash_profile"
 fi
+
+if ( ! grep -q HOME/bin/private $HOME/.bash_profile ) && ( find $HOME/bin/private &> /dev/null ); then
+	sed -i '/PATH=$HOME"/ a\    PATH="$HOME/bin/private:$PATH"' $HOME/.bash_profile
+	echo "patched .bash_profile to include private"
+fi

From e76508329f8eed19e4e0402a63a556010920d5d1 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Tue, 3 Jun 2014 14:11:35 -0700
Subject: [PATCH 30/33] setupbin: fix private append

---
 setupbin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setupbin b/setupbin
index 2679858..42022b6 100755
--- a/setupbin
+++ b/setupbin
@@ -21,6 +21,6 @@ else
 fi
 
 if ( ! grep -q HOME/bin/private $HOME/.bash_profile ) && ( find $HOME/bin/private &> /dev/null ); then
-	sed -i '/PATH=$HOME"/ a\    PATH="$HOME/bin/private:$PATH"' $HOME/.bash_profile
+	sed -i '/PATH="$HOME/bin/android/ a\    PATH="$HOME/bin/private:$PATH"' $HOME/.bash_profile
 	echo "patched .bash_profile to include private"
 fi

From 62ef1589501b9685699cca5893c1a486367abafb Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Tue, 3 Jun 2014 14:13:03 -0700
Subject: [PATCH 31/33] setupbin: forward slash the slashes

---
 setupbin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setupbin b/setupbin
index 42022b6..7d3d4ab 100755
--- a/setupbin
+++ b/setupbin
@@ -21,6 +21,6 @@ else
 fi
 
 if ( ! grep -q HOME/bin/private $HOME/.bash_profile ) && ( find $HOME/bin/private &> /dev/null ); then
-	sed -i '/PATH="$HOME/bin/android/ a\    PATH="$HOME/bin/private:$PATH"' $HOME/.bash_profile
+	sed -i '/PATH="$HOME\/bin\/android/ a\    PATH="$HOME/bin/private:$PATH"' $HOME/.bash_profile
 	echo "patched .bash_profile to include private"
 fi

From bc89960a0771161ac69e2c7a8ccda4b942766d44 Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 20 Jun 2014 16:46:40 -0700
Subject: [PATCH 32/33] nitenite: make sure code runs correct

---
 server/nitenite | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/server/nitenite b/server/nitenite
index ab8598a..34c529f 100755
--- a/server/nitenite
+++ b/server/nitenite
@@ -14,19 +14,16 @@
 # limitations under the License.
 
 main() {
-clear
-cd ~
 echo "How long would you like the computer to sleep for?"
 echo "Type list to see a list of units of time supported"
 echo "Type exit to leave program"
 echo "Example = 10 hours"
 read decision
 
-#if what was typed had any upper case letters convert it 
-#to lower case into another file and then rewrite the 
-#variable with the modification
+#if what was typed had any upper case letters convert it
+#to lower case
 
-if ( echo $decision | grep -q [A-Z] );then 
+if ( echo $decision | grep -q [A-Z] );then
 	decision=$(echo $decision | sed -e 's/\(.*\)/\L\1/')
 fi
 
@@ -37,7 +34,7 @@ length=$(echo $decision | sed 's/[^a-z]*//g')
 
 #exit if; quit program immediately if told to do so, easy way to work on this script
 
-if [ $length == "exit" ]; then
+if [ "$length" == "exit" ]; then
 	clear
 	echo "Program Terminated"
 	exit 0
@@ -45,7 +42,7 @@ fi
 
 #list if; type list and u get all the units in a list! amazing!
 
-if [ $length == "list" ]; then
+if [ "$length" == "list" ]; then
 	echo ""
 	echo "All supported units of time is:"
 	echo "seconds, minutes, hours, days, weeks, fortnights,"

From 31af8efefb3fec14b54916492fc047bd43bdfe4f Mon Sep 17 00:00:00 2001
From: Sean Donovan <swordrune10@gmail.com>
Date: Fri, 20 Jun 2014 17:03:24 -0700
Subject: [PATCH 33/33] nitenite: whitespace and comment fixes

---
 server/nitenite | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/nitenite b/server/nitenite
index 34c529f..3b8a515 100755
--- a/server/nitenite
+++ b/server/nitenite
@@ -35,7 +35,6 @@ length=$(echo $decision | sed 's/[^a-z]*//g')
 #exit if; quit program immediately if told to do so, easy way to work on this script
 
 if [ "$length" == "exit" ]; then
-	clear
 	echo "Program Terminated"
 	exit 0
 fi
@@ -52,8 +51,7 @@ if [ "$length" == "list" ]; then
 fi
 
 #this checks to see if what was typed had any numbers in
-#it, and if it doesnt the script will delete all unnecessary files
-#and terminate early
+#it, and if it doesnt the script will start over
 
 if ( ! echo $time | grep -q [0-9]); then
 	echo ""
@@ -62,8 +60,8 @@ if ( ! echo $time | grep -q [0-9]); then
 	main
 fi
 
-#the beginning of all the if statements to figure out how to calculate the results, 
-#it uses the unit of time specified to determine the length of the 
+#the beginning of all the if statements to figure out how to calculate the results,
+#it uses the unit of time specified to determine the length of the
 #effect the user wants
 
 #seconds if; easy
@@ -110,7 +108,7 @@ if [ $length == "month" ] || [ $length == "months" ]; then
 fi
 
 #years if; because of the calculated disaster of months i had to use the only
-#one that wasnt a decimal, which is ironically the actual answer of seconds 
+#one that wasnt a decimal, which is ironically the actual answer of seconds
 #there is in a year x.x
 #after this it will go back to just multiplying from this