9369: Remove cwl install from Python SDK page. Remove "sudo -i" from

pip/python install instructions.  Fixup use of ~$ prompt in example
instructions.

diff --git a/doc/sdk/cli/install.html.textile.liquid b/doc/sdk/cli/install.html.textile.liquid
index 53821b52643db5cb68812009dc37ce3755118bfb..cf6432da5067e442f5f55a3e219a067161c2df26 100644 (file)
--- a/doc/sdk/cli/install.html.textile.liquid
+++ b/doc/sdk/cli/install.html.textile.liquid
@@ -16,7 +16,7 @@ Install curl libraries with your system's package manager. For example, on Debia
 
 <notextile>
 <pre>
-$ <code class="userinput">sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev</code>
+~$ <code class="userinput">sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev</code>
 </pre>
 </notextile>
 
@@ -24,13 +24,13 @@ h3. Option 1: Install from RubyGems and PyPI
 
 <notextile>
 <pre>
-arvados/sdk/cli$ <code class="userinput">sudo -i gem install arvados-cli</code>
+~$ <code class="userinput">sudo -i gem install arvados-cli</code>
 </pre>
 </notextile>
 
 <notextile>
 <pre>
-arvados/sdk/cli$ <code class="userinput">sudo -i pip install arvados-python-client arvados-cwl-runner</code>
+~$ <code class="userinput">pip install arvados-python-client arvados-cwl-runner</code>
 </pre>
 </notextile>
 
@@ -38,23 +38,13 @@ h3. Option 2: Build and install from source
 
 <notextile>
 <pre>
-$ <code class="userinput">git clone https://github.com/curoverse/arvados.git</code>
-$ <code class="userinput">cd arvados/sdk/cli</code>
-$ <code class="userinput">gem build arvados-cli.gemspec</code>
-$ <code class="userinput">sudo -i gem install arvados-cli-*.gem</code>
-</pre>
-</notextile>
-
-<notextile>
-<pre>
-$ <code class="userinput">cd arvados/sdk/python</code>
-$ <code class="userinput">sudo -i python setup.py install</code>
-</pre>
-</notextile>
-
-<notextile>
-<pre>
-$ <code class="userinput">cd arvados/sdk/cwl</code>
-$ <code class="userinput">sudo -i python setup.py install</code>
+~$ <code class="userinput">git clone https://github.com/curoverse/arvados.git</code>
+~$ <code class="userinput">cd arvados/sdk/cli</code>
+~/arvados/sdk/cli$ <code class="userinput">gem build arvados-cli.gemspec</code>
+~/arvados/sdk/cli$ <code class="userinput">sudo -i gem install arvados-cli-*.gem</code>
+~/arvados/sdk/cli$ <code class="userinput">cd ../python</code>
+~/arvados/sdk/python$ <code class="userinput">python setup.py install</code>
+~/arvados/sdk/python$ <code class="userinput">cd ../cwl</code>
+~/arvados/sdk/cwl$ <code class="userinput">python setup.py install</code>
 </pre>
 </notextile>

diff --git a/doc/sdk/python/sdk-python.html.textile.liquid b/doc/sdk/python/sdk-python.html.textile.liquid
index 8380618e2345099a23ca3bac47dc8b2ce8c5e17e..0b0f77d377e209afc7c0f2a7717f9a0360293a6d 100644 (file)
--- a/doc/sdk/python/sdk-python.html.textile.liquid
+++ b/doc/sdk/python/sdk-python.html.textile.liquid
@@ -58,10 +58,8 @@ Install the @python-setuptools@ package from your distribution.  Then run the fo
 
 <notextile>
 <pre><code>~$ <span class="userinput">git clone https://github.com/curoverse/arvados.git</span>
-~$ <span class="userinput">cd ~/arvados/sdk/python</span>
-~$ <span class="userinput">python2.7 setup.py install</span>
-~$ <span class="userinput">cd ~/arvados/sdk/cwl</span>
-~$ <span class="userinput">python2.7 setup.py install</span>
+~$ <span class="userinput">cd arvados/sdk/python</span>
+~/arvados/sdk/python$ <span class="userinput">python2.7 setup.py install</span>
 </code></pre>
 </notextile>