From 189d2cf475997ce3adbdbd1e577a612bec385cb9 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Aug 2016 12:59:33 -0600 Subject: [PATCH] Update NSH document, README, and comments in a script file --- Documentation/NuttShell.html | 4 ++-- tools/README.txt | 1 - tools/sethost.sh | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html index 7af455d577..ecedd4ca6d 100644 --- a/Documentation/NuttShell.html +++ b/Documentation/NuttShell.html @@ -8,7 +8,7 @@

NuttShell (NSH)

-

Last Updated: July 20, 2016

+

Last Updated: August 4, 2016

@@ -3277,7 +3277,7 @@ nsh> mkfifo - CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_PIPES + CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_PIPES && CONFIG_DEV_PIPE_SIZE > 0 CONFIG_NSH_DISABLE_MKFIFO diff --git a/tools/README.txt b/tools/README.txt index 7a3ef64086..1fcac577c1 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -625,7 +625,6 @@ sethost.sh -32|64 selects 32- or 64-bit host (Only for Cygwin). Default 64 -h will show this help test and terminate - refresh.sh ---------- diff --git a/tools/sethost.sh b/tools/sethost.sh index 4072d5f471..b68b991b6f 100644 --- a/tools/sethost.sh +++ b/tools/sethost.sh @@ -212,7 +212,8 @@ cd $nuttx || { echo "ERROR: failed to cd to $nuttx"; exit 1; } make clean_context 1>/dev/null 2>&1 make olddefconfig 1>/dev/null 2>&1 -# Restore any previous .config and Make.defs files +# Move config file to correct location and restore any previous .config +# and Make.defs files if [ "X$dotconfig" != "Xy" ]; then sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" .config