From a3651646a9ae87881c18e9ee8163c206cfaae86f Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Mon, 10 Apr 2023 21:33:54 -0400
Subject: [PATCH] ndnsec: stop installing deprecated command aliases

Refs: #5163
Change-Id: Ia9f705529061a2ca2cb8bcbd1a9ef1d7a5ffae31
---
 tools/ndnsec/main.cpp | 16 +---------------
 tools/ndnsec/wscript  |  5 +----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/tools/ndnsec/main.cpp b/tools/ndnsec/main.cpp
index e731b5c0..436388f3 100644
--- a/tools/ndnsec/main.cpp
+++ b/tools/ndnsec/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2021 Regents of the University of California.
+ * Copyright (c) 2013-2023 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -51,14 +51,6 @@ Available commands:
 
 Try 'ndnsec COMMAND --help' for more information on each command.)STR";
 
-const std::map<std::string, std::string> deprecatedCommands{
-  {"certgen",           "cert-gen"},
-  {"dump-certificate",  "cert-dump"},
-  {"install-cert",      "cert-install"},
-  {"keygen",            "key-gen"},
-  {"ls-identity",       "list"},
-};
-
 int
 main(int argc, char* argv[])
 {
@@ -67,12 +59,6 @@ main(int argc, char* argv[])
   std::string command;
   if (basename.rfind("ndnsec-", 0) == 0) {
     command = basename.substr(std::strlen("ndnsec-"));
-    auto it = deprecatedCommands.find(command);
-    if (it != deprecatedCommands.end()) {
-      std::cerr << "DEPRECATION NOTICE: ndnsec-" << it->first << " is deprecated. "
-                << "Please use 'ndnsec " << it->second << "' instead.\n";
-      command = it->second;
-    }
   }
   else if (argc >= 2) {
     command = argv[1];
diff --git a/tools/ndnsec/wscript b/tools/ndnsec/wscript
index 55f557ff..e27c1e84 100644
--- a/tools/ndnsec/wscript
+++ b/tools/ndnsec/wscript
@@ -17,8 +17,5 @@ def build(bld):
     # create convenience symlinks
     for cmd in ('list', 'get-default', 'set-default', 'delete',
                 'key-gen', 'sign-req', 'cert-gen', 'cert-install',
-                'cert-dump', 'export', 'import', 'unlock-tpm',
-                # deprecated aliases
-                'certgen', 'dump-certificate', 'install-cert',
-                'keygen', 'ls-identity'):
+                'cert-dump', 'export', 'import', 'unlock-tpm'):
         bld.symlink_as('${BINDIR}/ndnsec-%s' % cmd, 'ndnsec')