Skip to content

Commit

Permalink
small grammer-ish edits
Browse files Browse the repository at this point in the history
  • Loading branch information
SaOgaz committed Jun 23, 2016
1 parent 80cc4e9 commit 1a51552
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion source/anaconda_linux_servers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Installing Anaconda On Linux Servers
####################################

You will probably want to access Anaconda from your account on the STScI Linux servers. If you are working on a Linux machine, congratulations this is already done! When you set up Anaconda in your ``/user/username`` directory and set up your ``bash`` files, this will get propagated to any other Linux servers. If you are on a mac machine, you can follow the Linux part of this instruction manual in an ``ssh`` session on any of the STScI Linux servers.
You will probably want to access Anaconda from your account on the STScI Linux servers. If you are working on a Linux machine, congratulations this is already done! When you set up Anaconda in your ``/user/username`` directory and set up your ``bash`` files, this will get propagated to any other Linux servers. If you are on a Mac machine, you can follow the Linux part of this instruction manual in an ``ssh`` session on any of the STScI Linux servers.
16 changes: 8 additions & 8 deletions source/bash_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Remove all references to ``Ureka`` (``SSB`` , ``SSBX``, ``SSBDEV``) in your shel
If you not sure what to look for, and haven’t edited your shell files before, look for references to ``ssbx``, ``ssbrel`` or ``ssbdev`` and remove those lines. You can use the following listed commands to search for ``Ureka`` dependencies. You may see a return from your ``$HOME/.ureka/.default`` file. This is expected and can be ignored.


**linux**:
**Linux**:

.. code-block:: sh
find $HOME -maxdepth 1 -type f -name '.*' | xargs -I'{}' grep -n -H -E --color=auto 'ssbrel|ssbx|ssbdev' "{}"
**osx**:
**OSX**:

Darwin’s BSD find does not support -maxdepth (users can install gnu findutils if they wish to execute the linux-style command on OS X, however)
Darwin’s BSD find does not support -maxdepth (users can install gnu findutils if they wish to execute the Linux-style command on OS X, however)

.. code-block:: sh
Expand Down Expand Up @@ -49,8 +49,8 @@ Now that you have a backup of your ``bash`` files safely stored, wipe all ``bash
.. code-block:: sh
>rm ~/.profile
>rm ~/.bash*
rm ~/.profile
rm ~/.bash*
Open up a new ``~/.bash_profile`` file. Remember this should be a blank text file, since we just deleted the previous copy if it existed. We will also set up a ``~/.bashrc`` file. Below is an example of a standard ``~/.bash_profile`` and ``~/.bashrc``.
Expand Down Expand Up @@ -143,13 +143,13 @@ To switch your default shell on Mac machines, open a terminal and use the follow
.. code-block:: sh
> chsh -s /bin/bash
chsh -s /bin/bash
and enter your password. To verify that the change went through, restart your terminal program, and type the following:
.. code-block:: sh
$ echo $SHELL
echo $SHELL
This command should return ``/bin/bash``
Expand All @@ -166,7 +166,7 @@ If you plan on using ``bash`` from ``tsch``, you can switch into ``bash`` using
.. code-block:: sh
>bash -l
bash -l
This call will inherit your environment setup from your ``tcsh``. This means any environment variables you have set in your ``tsch`` will get transferred over.
Expand Down
2 changes: 1 addition & 1 deletion source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ To do this you can use the ``-p`` option when installing Anaconda. At this time

.. code:: sh
$ sh Anaconda2-4.0.0-Linux-x86_64.sh -p /user/username/anaconda2
sh Anaconda2-4.0.0-Linux-x86_64.sh -p /user/username/anaconda2
Here you can change the folder name ``anaconda2`` to correspond to whichever version you chose to install, i.e. ``anaconda3``, ``miniconda2``, or ``miniconda3``.

Expand Down
30 changes: 15 additions & 15 deletions source/installing_anaconda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ As previously mentioned, Anaconda works with the ``bash`` shell, so please make

.. code-block:: sh
>bash -l
bash -l
Step 2: Make sure Anaconda was set up correctly
----------------------------------------------
Expand All @@ -23,10 +23,10 @@ To test that your ``PATH`` variable was correctly set for Anaconda after install

.. code-block:: sh
mac:
Mac:
export PATH="$HOME/anaconda3/bin:$PATH"
linux:
Linux:
export PATH="/user/username/anaconda2/bin"
If this line is missing please add it, making sure to use your Anaconda folder name. This varies depending on which version of Anaconda/Miniconda you downloaded. The default install location of Anaconda/Miniconda is in your home directory. So if you’ve run the Anaconda/Miniconda install with the default settings you should now see a directory similar to this in your home directory: ``~/anaconda2`` (If you grabbed Anaconda2), ``~/miniconda3`` (if you grabbed Miniconda3), etc.
Expand All @@ -52,7 +52,7 @@ This installs a base version of a new environment. Containing just the basic Py

.. code-block:: sh
$ conda create -n myenvironment python=2
conda create -n myenvironment python=2
**Example 2:**
Expand All @@ -61,7 +61,7 @@ Here we’re creating a new environment that will be populated with the basic Py

.. code-block:: sh
$ conda create -n bokehenv python=2 bokeh
conda create -n bokehenv python=2 bokeh
**Example 3:**
Expand All @@ -70,18 +70,18 @@ Alternatively, I could have omitted ``bokeh`` as an argument, or any specific pa

.. code-block:: sh
$ conda create -n bokehenv
$ source activate bokehenv
$ conda install bokeh
conda create -n bokehenv
source activate bokehenv
conda install bokeh
**Example 4:**

It is also possible to install packages into a named environment without the need to activate it first. The ``bokeh`` environment must already exist for this work

.. code-block:: sh
$ conda install -n bokehenv bokeh
$ source activate bokehenv
conda install -n bokehenv bokeh
source activate bokehenv
You’ll see these commands again as you walk through the AstroConda installation.
Expand All @@ -96,19 +96,19 @@ The next step is to add the ``astroconda`` channel.

.. code-block:: sh
$ conda config --add channels http://ssb.stsci.edu/astroconda
conda config --add channels http://ssb.stsci.edu/astroconda
Now we will create a new environment that contains AstroConda's ``stsci`` metapackage

.. code-block:: sh
$ conda create -n astroconda stsci
conda create -n astroconda stsci
and activate this new environment.

.. code-block:: sh
$ source activate astroconda
source activate astroconda
Make sure you are installing the ``stsci`` metapackage into a new environment and not your root Anaconda environment. If this has happened, please see the `AstroConda FAQ page <http://astroconda.readthedocs.io/en/latest/faq.html#i-installed-astroconda-into-my-anaconda-root-environment-what-now>`_ for instructions.

Expand All @@ -119,7 +119,7 @@ The Astropy Project also has a Anaconda channel which contains all of the ``astr

.. code-block:: sh
$ conda config --add channels astropy
conda config --add channels astropy
and you now have the ``astropy`` channel included by default.

Expand All @@ -133,7 +133,7 @@ Step 4: Quick test to see if your setup was succesful


.. note::
For a easy to use Conda reference sheet the Anaconda website has a helpful `Conda cheat sheet <http://conda.pydata.org/docs/using/cheatsheet.html>`_, or you can pick up a hardcopy right outside the IT helpdesk room in muller 330.
For a easy to use Conda reference sheet the Anaconda website has a helpful `Conda cheat sheet <http://conda.pydata.org/docs/using/cheatsheet.html>`_, or you can pick up a hardcopy right outside the IT helpdesk room in Muller 330.

Were going to simulate a fresh new bash shell for testing by using the following script, which you should save into a file called blackhole_env.sh:

Expand Down

0 comments on commit 1a51552

Please sign in to comment.