From c18b9618f4577fb80b07a0471f19a11ed2b3dfcb Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Thu, 3 Mar 2016 10:23:03 -0500
Subject: New implementation of the version display command (ref T6).

---
 templates/show/version/added/node.def      | 2 --
 templates/show/version/all/node.def        | 5 ++++-
 templates/show/version/deleted/node.def    | 2 --
 templates/show/version/downgraded/node.def | 2 --
 templates/show/version/funny/node.def      | 2 +-
 templates/show/version/node.def            | 2 +-
 templates/show/version/upgraded/node.def   | 2 --
 7 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 templates/show/version/added/node.def
 delete mode 100644 templates/show/version/deleted/node.def
 delete mode 100644 templates/show/version/downgraded/node.def
 delete mode 100644 templates/show/version/upgraded/node.def

(limited to 'templates')

diff --git a/templates/show/version/added/node.def b/templates/show/version/added/node.def
deleted file mode 100644
index 2381b74..0000000
--- a/templates/show/version/added/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus added packages
-run: ${vyatta_bindir}/vyatta-show-version added
diff --git a/templates/show/version/all/node.def b/templates/show/version/all/node.def
index 5b60609..8344124 100644
--- a/templates/show/version/all/node.def
+++ b/templates/show/version/all/node.def
@@ -1,2 +1,5 @@
 help: Show VyOS version information plus all packages changes
-run: ${vyatta_bindir}/vyatta-show-version all
+run: ${vyatta_bindir}/vyos-show-version
+     echo ""
+     echo "Package versions:"
+     dpkg -l
diff --git a/templates/show/version/deleted/node.def b/templates/show/version/deleted/node.def
deleted file mode 100644
index d328cf6..0000000
--- a/templates/show/version/deleted/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus deleted packages
-run: ${vyatta_bindir}/vyatta-show-version deleted
diff --git a/templates/show/version/downgraded/node.def b/templates/show/version/downgraded/node.def
deleted file mode 100644
index 250b048..0000000
--- a/templates/show/version/downgraded/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus downgraded packages
-run: ${vyatta_bindir}/vyatta-show-version downgraded
diff --git a/templates/show/version/funny/node.def b/templates/show/version/funny/node.def
index cb62c96..e6544f9 100644
--- a/templates/show/version/funny/node.def
+++ b/templates/show/version/funny/node.def
@@ -1,5 +1,5 @@
 help: Show VyOS version information plus a funny poem
 run:
-    ${vyatta_bindir}/vyatta-show-version
+    ${vyatta_bindir}/vyos-show-version
     ${vyatta_bindir}/limericks.py
 
diff --git a/templates/show/version/node.def b/templates/show/version/node.def
index 4237e5d..e2bfc1f 100644
--- a/templates/show/version/node.def
+++ b/templates/show/version/node.def
@@ -1,2 +1,2 @@
 help: Show VyOS version information
-run: ${vyatta_bindir}/vyatta-show-version
+run: ${vyatta_bindir}/vyos-show-version
diff --git a/templates/show/version/upgraded/node.def b/templates/show/version/upgraded/node.def
deleted file mode 100644
index b693c23..0000000
--- a/templates/show/version/upgraded/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information plus upgraded packages
-run: ${vyatta_bindir}/vyatta-show-version upgraded
-- 
cgit v1.2.3