revert rename, add link as "ua"

Signed-off-by: Alberto Donato <alberto.donato@canonical.com>

Makefile

@@ -5,7 +5,7 @@ test:
 	@tox
 
 lint:
-	@shellcheck -s dash advantage update-motd.d/*
+	@shellcheck -s dash ubuntu-advantage update-motd.d/*
 
 
 .PHONY: build test lint

README.md

@@ -1,4 +1,4 @@
-# advantage tool
+# ubuntu-advantage tool
 
 [![Build Status](https://travis-ci.org/CanonicalLtd/ubuntu-advantage-script.svg?branch=master)](https://travis-ci.org/CanonicalLtd/ubuntu-advantage-script)
 
@@ -13,7 +13,7 @@ Currently it supports the following:
 Run 
 
 ```
-$ advantage
+$ ./ubuntu-advantage
 ```
 
 to display usage information.

debian/install

@@ -1,3 +1,3 @@
-advantage usr/bin/
+ubuntu-advantage usr/bin/
 keyrings/*.gpg usr/share/keyrings/
 update-motd.d etc/

debian/links

@@ -1,2 +1,2 @@
-usr/bin/advantage usr/bin/ubuntu-advantage
-usr/share/man/man1/advantage.1 usr/share/man/man1/ubuntu-advantage.1
+usr/bin/ubuntu-advantage usr/bin/ua
+usr/share/man/man1/ubuntu-advantage.1 usr/share/man/man1/ua.1

debian/manpages

@@ -1 +1 @@
-advantage.1
+ubuntu-advantage.1

tests/test_script.py

@@ -1,4 +1,4 @@
-# Tests for the advantage script.
+# Tests for the ubuntu-advantage script.
 
 from testing import UbuntuAdvantageTest
 
@@ -21,7 +21,7 @@ def test_usage(self):
         """Calling the script with no args prints out the usage."""
         process = self.script()
         self.assertEqual(1, process.returncode)
-        self.assertIn('usage: advantage', process.stderr)
+        self.assertIn('usage: ubuntu-advantage', process.stderr)
 
     def test_status_precise(self):
         """The status command shows livepatch not available on precise."""

tests/testing.py

@@ -67,7 +67,7 @@ def read_file(self, path):
 
     def script(self, *args):
         """Run the script."""
-        command = ['./advantage']
+        command = ['./ubuntu-advantage']
         command.extend(args)
         path = os.pathsep.join([str(self.bin_dir), os.environ['PATH']])
         env = {

advantage → ubuntu-advantage

@@ -109,7 +109,7 @@ enable_livepatch() {
             echo "and run the following command one more time to complete the"
             echo "installation:"
             echo
-            echo "sudo advantage enable-livepatch $1"
+            echo "sudo ubuntu-advantage enable-livepatch $1"
             exit 5
         fi
     else

advantage.1 → ubuntu-advantage.1

@@ -1,14 +1,14 @@
-.TH ADVANTAGE 1  "28 April 2017" "" ""
+.TH UBUNTU-ADVANTAGE 1  "28 April 2017" "" ""
 .SH NAME
-advantage \- Enable or disable Ubuntu Advantage offerings from Canonical.
+ubuntu-advantage \- Enable or disable Ubuntu Advantage offerings from
+Canonical.
 .SH SYNOPSIS
-.B advantage
-<command> [parameters]
-.PP
-Also provided for backwards compatibility:
-.PP
 .B ubuntu-advantage
 <command> [parameters]
+.TP
+.B ua
+<command> [parameters]
+
 .SH DESCRIPTION
 This tool is used to enable or disable specific Ubuntu Advantage offerings
 from Canonical. The available modules and their commands are described below.
@@ -51,7 +51,7 @@ Install, Configure, and Enable FIPS 140-2 certified modules.
 enable-fips \fItoken\fR
 Enable the FIPS PPA repository, install the FIPS modules, configure
 the bootloader and enable fips on the system. After successfully executing the
-advantage script to enable fips, the system MUST be rebooted to
+ubuntu-advantage script to enable fips, the system MUST be rebooted to
 complete the enablement process. Failing to reboot will result in the system
 not being fips enabled.
 The \fItoken\fR argument must be in the form "user:password".

update-motd.d/99-esm

@@ -5,9 +5,9 @@ DESCRIPTION=$(lsb_release -ds)
 
 [ "$SERIES" = "precise" ] || exit 0
 
-[ -x /usr/bin/advantage ] || exit 0
+[ -x /usr/bin/ubuntu-advantage ] || exit 0
 
-if advantage is-esm-enabled; then
+if ubuntu-advantage is-esm-enabled; then
     cat <<EOF
 This ${DESCRIPTION} system is configured to receive extended security updates
 from Canonical: