From 2962fe46c37b50ec1c88229970b87472ad15bd83 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Thu, 16 Jul 2015 14:28:46 +0200
Subject: improve yaupg (check if yaourt is installed); add ga Alias (git add);
 add --description to all alias functions;

---
 config/fish/functions/diff.fish          | 2 +-
 config/fish/functions/git-alias/ga.fish  | 3 +++
 config/fish/functions/git-alias/gca.fish | 2 +-
 config/fish/functions/git-alias/gl.fish  | 2 +-
 config/fish/functions/git-alias/glg.fish | 2 +-
 config/fish/functions/git-alias/gp.fish  | 2 +-
 config/fish/functions/git-alias/gsi.fish | 2 +-
 config/fish/functions/git-alias/gst.fish | 2 +-
 config/fish/functions/git-alias/gsu.fish | 2 +-
 config/fish/functions/screensoff.fish    | 2 +-
 config/fish/functions/screenson.fish     | 2 +-
 config/fish/functions/yaupg.fish         | 8 ++++++--
 12 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 config/fish/functions/git-alias/ga.fish

(limited to 'config')

diff --git a/config/fish/functions/diff.fish b/config/fish/functions/diff.fish
index eb6fe47..6af04ee 100644
--- a/config/fish/functions/diff.fish
+++ b/config/fish/functions/diff.fish
@@ -1,3 +1,3 @@
-function diff
+function diff --description 'Alias for colordiff'
 	colordiff $argv; 
 end
diff --git a/config/fish/functions/git-alias/ga.fish b/config/fish/functions/git-alias/ga.fish
new file mode 100644
index 0000000..6d3f6e2
--- /dev/null
+++ b/config/fish/functions/git-alias/ga.fish
@@ -0,0 +1,3 @@
+function ga --description "Alias for git add"
+	git add $argv;
+end
diff --git a/config/fish/functions/git-alias/gca.fish b/config/fish/functions/git-alias/gca.fish
index 3042bda..d23d466 100644
--- a/config/fish/functions/git-alias/gca.fish
+++ b/config/fish/functions/git-alias/gca.fish
@@ -1,3 +1,3 @@
-function gca
+function gca --description "Alias for git commit -v -a"
 	git commit -v -a $argv;
 end
diff --git a/config/fish/functions/git-alias/gl.fish b/config/fish/functions/git-alias/gl.fish
index a9701ef..962172c 100644
--- a/config/fish/functions/git-alias/gl.fish
+++ b/config/fish/functions/git-alias/gl.fish
@@ -1,3 +1,3 @@
-function gl
+function gl --description "Alias for git pull"
 	git pull $argv;
 end
diff --git a/config/fish/functions/git-alias/glg.fish b/config/fish/functions/git-alias/glg.fish
index 30ea3d1..6dedd51 100644
--- a/config/fish/functions/git-alias/glg.fish
+++ b/config/fish/functions/git-alias/glg.fish
@@ -1,3 +1,3 @@
-function glg
+function glg --description "Alias for git log --stat --color"
 	git log --stat --color $argv;
 end
diff --git a/config/fish/functions/git-alias/gp.fish b/config/fish/functions/git-alias/gp.fish
index f002d35..18078be 100644
--- a/config/fish/functions/git-alias/gp.fish
+++ b/config/fish/functions/git-alias/gp.fish
@@ -1,3 +1,3 @@
-function gp
+function gp --description "Alias for git push"
 	git push $argv;
 end
diff --git a/config/fish/functions/git-alias/gsi.fish b/config/fish/functions/git-alias/gsi.fish
index 3af057d..e839a2b 100644
--- a/config/fish/functions/git-alias/gsi.fish
+++ b/config/fish/functions/git-alias/gsi.fish
@@ -1,3 +1,3 @@
-function gsi
+function gsi --description "Alias for git submodule init"
 	git submodule init $argv;
 end
diff --git a/config/fish/functions/git-alias/gst.fish b/config/fish/functions/git-alias/gst.fish
index 98e3bab..9cccab6 100644
--- a/config/fish/functions/git-alias/gst.fish
+++ b/config/fish/functions/git-alias/gst.fish
@@ -1,3 +1,3 @@
-function gst
+function gst --description "Alias for git status"
 	git status $argv;
 end
diff --git a/config/fish/functions/git-alias/gsu.fish b/config/fish/functions/git-alias/gsu.fish
index 040a596..6152397 100644
--- a/config/fish/functions/git-alias/gsu.fish
+++ b/config/fish/functions/git-alias/gsu.fish
@@ -1,3 +1,3 @@
-function gsu
+function gsu --description "Alias for git submodule update"
 	git submodule update $argv;
 end
diff --git a/config/fish/functions/screensoff.fish b/config/fish/functions/screensoff.fish
index e984536..5256730 100644
--- a/config/fish/functions/screensoff.fish
+++ b/config/fish/functions/screensoff.fish
@@ -1,3 +1,3 @@
-function screensoff
+function screensoff --description "disable xscreensaver and dpms"
 	xset s off; xset -dpms; and echo 'xcreensaver and dpms disabled' $argv; 
 end
diff --git a/config/fish/functions/screenson.fish b/config/fish/functions/screenson.fish
index 10af988..6c95ba0 100644
--- a/config/fish/functions/screenson.fish
+++ b/config/fish/functions/screenson.fish
@@ -1,3 +1,3 @@
-function screenson
+function screenson --description "enable xscreensaver and dpms"
 	xset s on; xset +dpms; and echo 'xscreensaver and dpms enabled' $argv; 
 end
diff --git a/config/fish/functions/yaupg.fish b/config/fish/functions/yaupg.fish
index 6c9b59a..4ed5dcd 100644
--- a/config/fish/functions/yaupg.fish
+++ b/config/fish/functions/yaupg.fish
@@ -1,3 +1,7 @@
-function yaupg
-	yaourt -Syua $argv; 
+function yaupg --description 'Alias for yaourt -Syua'
+    if type yaourt 1>/dev/null 2>/dev/null
+	    yaourt -Syua $argv; 
+    else
+        echo "yaourt not installed"
+    end
 end
-- 
cgit v1.2.3