Fixed the command-line tools usage
Change-Id: Ibf96ff95f4876836b6b259d28f7012ce170557cf
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6e87640..1eec369 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,10 @@
Release Notes
=============
+## Version 0.2.5
+
+- Fix another bug in `ndn` command-line tool
+
## Version 0.2.4
- Introduce function to quickly enable local NDN communication using Ad Hoc WiFi
diff --git a/make-osx-bundle.py b/make-osx-bundle.py
index db61242..79d7222 100755
--- a/make-osx-bundle.py
+++ b/make-osx-bundle.py
@@ -270,6 +270,7 @@
ftype = Popen(['/usr/bin/file', '-b', "%s/%s" % (src, file)], stdout=PIPE).communicate()[0]
if "Mach-O" in ftype:
shutil.copy("%s/%s" % (src, file), "%s/%s" % (dstBinary, file))
+ os.symlink("../../Helpers/%s" % file, "%s/%s" % (dstResource, file))
else:
shutil.copy("%s/%s" % (src, file), "%s/%s" % (dstResource, file))
Popen(['/usr/bin/sed', '-i', '', '-e', 's|`dirname "$0"`/|`dirname "$0"`/../../Helpers/|', "%s/%s" % (dstResource, file)]).communicate()[0]
diff --git a/ndn-control-center.xml b/ndn-control-center.xml
index ca26bf1..6800843 100644
--- a/ndn-control-center.xml
+++ b/ndn-control-center.xml
@@ -2,25 +2,25 @@
<channel>
<title>NDN App Changleog</title>
<link>
- https://named-data.net/binaries/NFD-Control-Center/ndn-control-center.xml
+ https://named-data.net/binaries/NDN-Control-Center/ndn-control-center.xml
</link>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<item>
<title>Version 0.2.0 (ndn-cxx version 0.5.1, NFD version 0.5.1, ndn-tools version 0.4)</title>
<ns0:releaseNotesLink>
- https://named-data.net/binaries/NFD-Control-Center/release-notes-0.2.0.html
+ https://named-data.net/binaries/NDN-Control-Center/release-notes-0.2.0.html
</ns0:releaseNotesLink>
<pubDate>Wed, 4 Feb 2017 22:51:00 +0000</pubDate>
- <enclosure length="27627391" type="application/octet-stream" url="https://named-data.net/binaries/NFD-Control-Center/NDN-0.2.0.dmg" ns0:dsaSignature="MCwCFE99cPadMXCDKvUV8uzj7lLlSFIzAhQwcJtGb0VaVAEEsvzumr64SBWJvw==" ns0:version="0.2.0" />
+ <enclosure length="27627391" type="application/octet-stream" url="https://named-data.net/binaries/NDN-Control-Center/NDN-0.2.0.dmg" ns0:dsaSignature="MCwCFE99cPadMXCDKvUV8uzj7lLlSFIzAhQwcJtGb0VaVAEEsvzumr64SBWJvw==" ns0:version="0.2.0" />
</item>
<item>
<title>Version 0.2.1 (ndn-cxx version 0.5.1, NFD version 0.5.1, ndn-tools version 0.4)</title>
<ns0:releaseNotesLink>
- https://named-data.net/binaries/NFD-Control-Center/release-notes-0.2.1.html
+ https://named-data.net/binaries/NDN-Control-Center/release-notes-0.2.1.html
</ns0:releaseNotesLink>
<pubDate>Thu, 9 Feb 2017 15:55:00 +0000</pubDate>
- <enclosure length="27883199" type="application/octet-stream" url="https://named-data.net/binaries/NFD-Control-Center/NDN-0.2.1.dmg" ns0:dsaSignature="MCwCFAD66xeADU9oA3mzU7/XiGvyuVipAhRcBNwHTXDoyEjo+jR0UJJuAztz8g==" ns0:version="0.2.1" />
+ <enclosure length="27883199" type="application/octet-stream" url="https://named-data.net/binaries/NDN-Control-Center/NDN-0.2.1.dmg" ns0:dsaSignature="MCwCFAD66xeADU9oA3mzU7/XiGvyuVipAhRcBNwHTXDoyEjo+jR0UJJuAztz8g==" ns0:version="0.2.1" />
</item>
<item>
<title>Version 0.2.2 (ndn-cxx version 0.5.1-34-g1709aa7, NFD version 0.5.1-38-gd396b61, ndn-tools version 0.4)</title>
@@ -40,5 +40,11 @@
<ns0:minimumSystemVersion>10.12.0</ns0:minimumSystemVersion>
<enclosure length="27751651" type="application/octet-stream" url="https://named-data.net/binaries/NDN-Control-Center/NDN-0.2.4.dmg" ns0:dsaSignature="MC0CFFu7Gz4ue3ESbVfA3/5ak1BsDsevAhUAlJO7SdLhWK8ZtW2SvoA8yomDwIg=" ns0:shortVersionString="0.2.4" ns0:version="0.2.4" />
<ns0:releaseNotesLink>https://named-data.net/binaries/NDN-Control-Center/release-notes-0.2.4.html</ns0:releaseNotesLink></item>
+<item>
+<title>Version 0.2.5 (ndn-cxx version 0.5.1-34-g1709aa7, NFD version 0.5.1-38-gd396b61, ndn-tools version 0.4)</title>
+<pubDate>Wed, 22 Mar 2017 09:14:23 -0700</pubDate>
+<ns0:minimumSystemVersion>10.12.0</ns0:minimumSystemVersion>
+<enclosure length="27055213" type="application/octet-stream" url="https://named-data.net/binaries/NDN-Control-Center/NDN-0.2.5.dmg" ns0:dsaSignature="MCwCFGwGnsAYSekmd/jjLYpBqo24BJA7AhRrqPvd5hxheZ5XZNMd6FCZ01xwjg==" ns0:shortVersionString="0.2.5" ns0:version="0.2.5" />
+<ns0:releaseNotesLink>https://named-data.net/binaries/NDN-Control-Center/release-notes-0.2.5.html</ns0:releaseNotesLink></item>
</channel>
-</rss>
+</rss>
\ No newline at end of file
diff --git a/res/bin/ndn b/res/bin/ndn
deleted file mode 100755
index 1ced1b6..0000000
--- a/res/bin/ndn
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-function usage() {
- echo
- echo Available commands:
- for command in $(ls /Applications/NDN.app/Contents/Helpers/ 2>/dev/null); do
- echo " $command"
- done
- for command in $(ls /Applications/NDN.app/Contents/Resources/bin/ 2>/dev/null); do
- echo " $command"
- done
-}
-
-if [[ $# -eq 0 ]]; then
- echo ERROR: No command is specified
- usage
- exit 1
-fi
-
-if [[ -f /Applications/NDN.app/Contents/Helpers/"$1" ]]; then
- /Applications/NDN.app/Contents/Helpers/"$@"
-elif [[ -f /Applications/NDN.app/Contents/Resources/bin/"$1" ]]; then
- /Applications/NDN.app/Contents/Resources/bin/"$@"
-else
- echo ERROR: Unknown is specified
- usage
- exit 1
-fi
diff --git a/res/ndn b/res/ndn
new file mode 100755
index 0000000..1c1b473
--- /dev/null
+++ b/res/ndn
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+NDN=`readlink "$0"`
+NDN_APP=`dirname "$NDN"`/..
+
+function usage() {
+ echo
+ echo Available commands:
+ for command in $(ls "$NDN_APP/Resources/bin/" 2>/dev/null); do
+ echo " $command"
+ done
+}
+
+if [[ $# -eq 0 ]]; then
+ echo ERROR: No command is specified
+ usage
+ exit 1
+fi
+
+if [[ -f "$NDN_APP"/Helpers/"$1" ]]; then
+ "$NDN_APP"/Helpers/"$@"
+elif [[ -f "$NDN_APP"/Resources/bin/"$1" ]]; then
+ "$NDN_APP"/Resources/bin/"$@"
+else
+ echo ERROR: Unknown is specified
+ usage
+ exit 1
+fi
diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index cf3b5b8..e95f251 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -450,7 +450,7 @@
<< "do shell script \""
"/bin/mkdir -vp /usr/local/bin; "
"/bin/ln -s -f '" + QCoreApplication::applicationDirPath() +
- "/../Resources/bin/ndn" + "' /usr/local/bin/ndn;"
+ "/../Resources/ndn" + "' /usr/local/bin/ndn;"
"\" with administrator privileges");
#endif
}
diff --git a/wscript b/wscript
index 18d8b78..2d5a474 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-VERSION='0.2.4'
+VERSION='0.2.5'
APPNAME='ndn-control-center'
APPCAST='https://named-data.net/binaries/NDN-Control-Center/ndn-control-center.xml'