Merge branch 'master' of githubp:GeoffreyFrogeye/dotfiles

scripts/locinst.sh

@@ -44,16 +44,16 @@ function error { # str
 
 function locinst_arch { 
 
+    function getPageLink { # package, arch, repo
+        echo "https://www.archlinux.org/packages/$3/$2/$1/"
+    }
+
 	function getDlLink { # package, arch, repo
 		echo "$(getPageLink $1 $2 $3)download/"
 	}
 
 	function findPackage { # package
 
-		function getPageLink { # package, arch, repo
-			echo "https://www.archlinux.org/packages/$3/$2/$1/"
-		}
-
 		function testLink { # link
 			wget -q --max-redirect 0 "$1" -O /dev/null
 			return $?

xinitrc

@@ -6,12 +6,12 @@
 # Executed by startx (run your window manager from here)
 #
 
-[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
+[ -f ~/.Xresources ] && xrdb -merge -I$HOME ~/.Xresources
 
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
 
 found=0
-function tryDM {
+tryDM() {
 	if [ $found -eq 0 ]; then
 		parameters=''
 		case $1 in