diff --git a/README.txt b/README.txt index c7ebb23..eff9e2f 100644 --- a/README.txt +++ b/README.txt @@ -1,11 +1,11 @@ ======= -RTShell +rtshell ======= Introduction ============ -RTShell provides commands used to manage individual RT components and +rtshell provides commands used to manage individual RT components and managers, as well as complete RT Systems. It can be used with the OpenRTM-aist middleware or middlewares that use a compatible CORBA-based introspection system. @@ -24,7 +24,7 @@ components on low-resource systems, systems where a GUI is not available (particularly where no network connection is available to manage components from another computer), as well as those who face other difficulties using RTSystemEditor. Being familiar with using a -command-line is a benefit when using these commands of RTShell. +command-line is a benefit when using these commands of rtshell. This software is developed at the National Institute of Advanced Industrial Science and Technology. Approval number @@ -41,12 +41,12 @@ Requirements omniORB-py 4.x is required. -RTShell requires rtctree. It must be installed for the commands to function. +rtshell requires rtctree. It must be installed for the commands to function. The commands that work with RtsProfile files require rtsprofile. It must be installed for these commands to function/ -RTShell requires Python 2.7. It will not function with an earlier version of +rtshell requires Python 2.7. It will not function with an earlier version of Python. It has not been tested with Python 3 and it is likely that several changes will be necessary to make it function using this version of Python. @@ -55,7 +55,7 @@ rtprint, rtinject and rtlog require the Python version of OpenRTM-aist. Sphinx must be installed to build the documentation, if installing from source (method 2). -If RTShell is installed using pip (method 1, below), RTCTree and RTSProfile +If rtshell is installed using pip (method 1, below), RTCTree and RTSProfile will be installed automatically. omniORB-py and OpenRTM-python must still be installed manually. @@ -70,7 +70,7 @@ There are several methods of installation available: a. Install pip if it is not already installed. See https://pip.pypa.io/en/latest/installing/ - b. Execute the following command to install RTShell:: + b. Execute the following command to install rtshell:: $ pip install rtshell @@ -92,7 +92,7 @@ There are several methods of installation available: $ cd /home/blurgle/src/ $ tar -xvzf rtshell.tar.gz - b. Run setup.py to install RTShell to your default Python installation:: + b. Run setup.py to install rtshell to your default Python installation:: $ python setup.py install @@ -126,7 +126,7 @@ Documentation is available in the form of man pages (on Windows, these are available as HTML files). These will be installed under ``${prefix}/share/man``. You must add this folder to your system's ``$MANPATH`` environment variable to be able to use them. For example, -if you installed RTShell into /home/blag, add the following line to your +if you installed rtshell into /home/blag, add the following line to your ``.bashrc``:: export MANPATH=/home/blag/share/man:${MANPATH} @@ -236,7 +236,7 @@ Changelog - rtresurrect: Don't recreate existing connections. - rtteardown: Fail if the connector ID doesn't match. - rtresurrect/rtstart/rtstop/rtteardown: Accept input from standard input. -- Refactored former rtsshell commands into RTShell-style libraries. +- Refactored former rtsshell commands into rtshell-style libraries. - Added tests. diff --git a/README_ja.txt b/README_ja.txt index 7cf19f9..711d7bf 100644 --- a/README_ja.txt +++ b/README_ja.txt @@ -1,11 +1,11 @@ ======= -RTShell +rtshell ======= イントロダクション ================== -RTShell は、ネームサーバ上に登録されているRTコンポーネントをシェルから +rtshell は、ネームサーバ上に登録されているRTコンポーネントをシェルから 管理することができるツールです。コンポーネントを activate/deactivate/resetしたり、ポートの接続を行うことができます。RTシ ステムを管理することもできます。 @@ -110,7 +110,7 @@ clone」を使うこともできます。パッチを送りたがったら、こ ドキュメントはマンページとして提供します（Windowsの場合はHTMLに提供しま す）。``${prefix}/share/man``にインストールされます。このパスを -``$MANPATH``という環境変数に追加する必要です。例えば、RTShellは +``$MANPATH``という環境変数に追加する必要です。例えば、rtshellは ``/home/blurgle``にインストールされた場合、以下の行を``.bashrc``に追加して ください:: diff --git a/installer/rtshell.wxs b/installer/rtshell.wxs index 8d845b7..5a8de04 100644 --- a/installer/rtshell.wxs +++ b/installer/rtshell.wxs @@ -1,17 +1,17 @@ - + Version="4.2.2"> + Version="4.2.2"> - + @@ -170,12 +170,12 @@ - - - - - - + + + + + + diff --git a/rtshell/__init__.py b/rtshell/__init__.py index 469ce5f..077897a 100644 --- a/rtshell/__init__.py +++ b/rtshell/__init__.py @@ -18,7 +18,7 @@ ''' -RTSH_VERSION = '4.2.1' +RTSH_VERSION = '4.2.2' # vim: tw=79 diff --git a/rtshell/post_install.py b/rtshell/post_install.py index fc276bf..638fb86 100644 --- a/rtshell/post_install.py +++ b/rtshell/post_install.py @@ -168,15 +168,24 @@ def add_shell_support(prefix, bashrc_path=None): def post_install_unix(prefix, bashrc, interactive, remove=False): # Link the manpages to the manpage directory under the prefix - ans = raw_input('Link man pages? ') if interactive else 'y' + if sys.version_info[0] == 2: + ans = raw_input('Link man pages? ') if interactive else 'y' + else: + ans = input('Link man pages? ') if interactive else 'y' if ans.lower() == 'y' or ans.lower() == 'yes': link_man_pages(prefix, remove) # Link documentation to /share/doc/rtshell - ans = raw_input('Link documentation? ') if interactive else 'y' + if sys.version_info[0] == 2: + ans = raw_input('Link documentation? ') if interactive else 'y' + else: + ans = input('Link documentation? ') if interactive else 'y' if ans.lower() == 'y' or ans.lower() == 'yes': link_documentation(prefix, remove) # Add sourcing of share/rtshell/shell_support to .bashrc or .bash_profile - ans = raw_input('Add shell support to .bashrc? ') if interactive else 'y' + if sys.version_info[0] == 2: + ans = raw_input('Add shell support to .bashrc? ') if interactive else 'y' + else: + ans = input('Add shell support to .bashrc? ') if interactive else 'y' if ans.lower() == 'y' or ans.lower() == 'yes': add_shell_support(prefix, bashrc_path=bashrc) diff --git a/setup.py b/setup.py index 155cee3..e67568c 100644 --- a/setup.py +++ b/setup.py @@ -290,9 +290,12 @@ def config_bash_compl(self): COMPOPT_NOSPACE = 'compopt -o nospace' COMPOPT_FILENAME = 'compopt -o filenames' COMPLETE_NOSPACE = '-o nospace' - with open(os.path.join('data', 'bash_completion.in'), 'rt') as f: - bash_comp = f.read() - bash_comp = bash_comp.decode('utf-8') + if sys.version_info[0] == 2: + with open(os.path.join('data', 'bash_completion.in'), 'rt') as f: + bash_comp = f.read() + else: + with open(os.path.join('data', 'bash_completion.in'), 'rt', encoding='utf-8') as f: + bash_comp = f.read() if sys.platform == 'darwin': bash_comp = bash_comp.replace('@COMPOPT_NOSPACE@', ':') bash_comp = bash_comp.replace('@COMPOPT_FILENAMES@', ':') @@ -387,7 +390,7 @@ def run(self): setuptools.setup(name='rtshell', - version='4.2.1', + version='4.2.2', description='Shell commands for managing RT Components and RT Systems.', author='Geoffrey Biggs and contributors', author_email='geoffrey.biggs@aist.go.jp',