8 files changed, 21 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index 82d2a53..c9849cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,10 +13,6 @@ allowed_DATA	 = functions/allowed/hosts
 
 bin_SCRIPTS	 = scripts/vyatta-show-interfaces
 bin_SCRIPTS	+= scripts/vyatta-show-version
-bin_SCRIPTS	+= scripts/count
-bin_SCRIPTS	+= scripts/match
-bin_SCRIPTS	+= scripts/no-match
-bin_SCRIPTS	+= scripts/no-more
 
 bin_sudo_users_SCRIPTS = scripts/vyatta-show-log
 bin_sudo_users_SCRIPTS += scripts/vyatta-show-log-all
diff --git a/debian/vyatta-op.postinst.in b/debian/vyatta-op.postinst.in
index 626ace2..4f0b3b4 100644
--- a/debian/vyatta-op.postinst.in
+++ b/debian/vyatta-op.postinst.in
@@ -8,8 +8,4 @@ bindir=@bindir@
 ln -sf /usr/sbin/ethtool ${bindir}/sudo-users/ethtool
 ln -sf /usr/sbin/dmidecode ${bindir}/sudo-users/dmidecode
 ln -sf /sbin/iptables ${bindir}/sudo-users/iptables
-ln -sf ${bindir}/count /usr/bin/
-ln -sf ${bindir}/match /usr/bin/
-ln -sf ${bindir}/no-match /usr/bin/
-ln -sf ${bindir}/no-more /usr/bin/
 
diff --git a/debian/vyatta-op.postrm.in b/debian/vyatta-op.postrm.in
index 34f21ed..f86a7ba 100644
--- a/debian/vyatta-op.postrm.in
+++ b/debian/vyatta-op.postrm.in
@@ -9,9 +9,5 @@ if [ "$1" = "purge" ]; then
   rm -f ${bindir}/sudo-users/ethtool
   rm -f ${bindir}/sudo-users/dmidecode
   rm -f ${bindir}/sudo-users/iptables
-  rm -f /usr/bin/count
-  rm -f /usr/bin/match
-  rm -f /usr/bin/no-match
-  rm -f /usr/bin/no-more
 fi
 
diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op
index 52be05a..d5ea362 100644
--- a/etc/bash_completion.d/10vyatta-op
+++ b/etc/bash_completion.d/10vyatta-op
@@ -291,6 +291,27 @@ _vyatta_op_run ()
     return $ret
 }
 
+# "pipe" functions
+count ()
+{
+  wc -l "$@"
+}
+
+match ()
+{
+  grep -E -e "$@"
+}
+
+no-match ()
+{
+  grep -E -v -e "$@"
+}
+
+no-more ()
+{
+  cat "$@"
+}
+
 # don't initialize if we are in configure mode
 if [ "$_OFR_CONFIGURE" == "ok" ]; then
   return 0
diff --git a/scripts/count b/scripts/count
deleted file mode 100755
index 1ab3796..0000000
--- a/scripts/count
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-wc -l "$@"
-
diff --git a/scripts/match b/scripts/match
deleted file mode 100755
index c452824..0000000
--- a/scripts/match
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-grep -E -e "$@"
-
diff --git a/scripts/no-match b/scripts/no-match
deleted file mode 100755
index 528d80c..0000000
--- a/scripts/no-match
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-grep -E -v -e "$@"
-
diff --git a/scripts/no-more b/scripts/no-more
deleted file mode 100755
index 59f51e8..0000000
--- a/scripts/no-more
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cat "$@"
-