Merge lp:~xnox/command-not-found/apt-get-is-dead into lp:~command-not-found-developers/command-not-found/trunk

[Dimitri John Ledkov]

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2013-06-17 09:00:52 +0000
+++ CommandNotFound/CommandNotFound.py	2015-09-10 11:10:43 +0000
@@ -220,7 +220,7 @@
                     command_prefix = ""
                 else:
                     command_prefix = "sudo "
-                install_command = "%sapt-get install %s" % (command_prefix, package_name)
+                install_command = "%sapt install %s" % (command_prefix, package_name)
                 print("%s" % install_command, file=sys.stdout)
                 subprocess.call(install_command.split(), shell=False)
 
@@ -254,9 +254,9 @@
                     print(_("This is most likely caused by the lack of administrative privileges associated with your user account."), file=sys.stderr)
             return False
 
-        # do not give advice if we are in a situation where apt-get
+        # do not give advice if we are in a situation where apt
         # or aptitude are not available (LP: #394843)
-        if not (os.path.exists("/usr/bin/apt-get") or
+        if not (os.path.exists("/usr/bin/apt") or
                 os.path.exists("/usr/bin/aptitude")):
             return False
 
@@ -269,11 +269,11 @@
             print(_("The program '%s' is currently not installed. ") % command, end="", file=sys.stderr)
             if posix.geteuid() == 0:
                 print(_("You can install it by typing:"), file=sys.stderr)
-                print("apt-get install %s" % packages[0][0], file=sys.stderr)
+                print("apt install %s" % packages[0][0], file=sys.stderr)
                 self.install_prompt(packages[0][0])
             elif self.user_can_sudo:
                 print(_("You can install it by typing:"), file=sys.stderr)
-                print("sudo apt-get install %s" % packages[0][0], file=sys.stderr)
+                print("sudo apt install %s" % packages[0][0], file=sys.stderr)
                 self.install_prompt(packages[0][0])
             else:
                 print(_("To run '%(command)s' please ask your administrator to install the package '%(package)s'") % {'command': command, 'package': packages[0][0]}, file=sys.stderr)
@@ -288,9 +288,9 @@
                 else:
                     print(" * %s" % package[0] + " (" + _("You will have to enable component called '%s'") % package[1] + ")", file=sys.stderr)
             if posix.geteuid() == 0:
-                print(_("Try: %s <selected package>") % "apt-get install", file=sys.stderr)
+                print(_("Try: %s <selected package>") % "apt install", file=sys.stderr)
             elif self.user_can_sudo:
-                print(_("Try: %s <selected package>") % "sudo apt-get install", file=sys.stderr)
+                print(_("Try: %s <selected package>") % "sudo apt install", file=sys.stderr)
             else:
                 print(_("Ask your administrator to install one of them"), file=sys.stderr)
         return len(packages) > 0