Skip to content

Commit

Permalink
MAINT: rename install scripts
Browse files Browse the repository at this point in the history
Use a hyphen instead of underscore in install script names
  • Loading branch information
Blake Caldwell committed May 15, 2020
1 parent 73dcd71 commit 57a305b
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ before_install:
export PATH=/usr/bin:/usr/local/bin:$PATH
echo "Starting Ubuntu install script"
installer/ubuntu/installer.sh
installer/ubuntu/hnn-ubuntu.sh
NLOPT_LIB=$(ls -d $HOME/.local/lib/python*/site-packages)
echo $NLOPT_LIB
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions installer/centos/native_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ The script below assumes that it can update OS packages for python and prerequis
- CentOS 7: [centos7-installer.sh](centos7-installer.sh)

```bash
chmod +x ./centos7-installer.sh
./centos7-installer.sh
chmod +x ./hnn-centos7.sh
./hnn-centos7.sh
```

- CentOS 6 (no longer maintained): [centos6-installer.sh](centos6-installer.sh)

```bash
chmod +x ./centos6-installer.sh
./centos6-installer.sh
chmod +x ./hnn-centos6.sh
./hnn-centos6.sh
```

## Troubleshooting
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions installer/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ COPY installer/docker/hnn_envs /home/hnn_user
COPY installer/docker/start_hnn.sh /home/hnn_user
COPY installer/docker/check_hnn_out_perms.sh /home/hnn_user

ADD installer/windows/hnn.ps1 /home/hnn_user/Downloads/
RUN powershell -executionpolicy bypass -File "C:\home\hnn_user\Downloads\hnn.ps1" && \
ADD installer/windows/hnn-windows.ps1 /home/hnn_user/Downloads/
RUN powershell -executionpolicy bypass -File "C:\home\hnn_user\Downloads\hnn-windows.ps1" && \
powershell -Command "$env:PATH = 'C:\home\hnn_user\AppData\Local\Programs\Git\bin;' + $env:PATH + \
';"C:\Program Files\VcXsrv";C:\home\hnn_user\Miniconda3\Scripts;C:\home\hnn_user\Miniconda3\envs\hnn;' + \
'C:\home\hnn_user\Miniconda3\envs\hnn\Scripts;C:\home\hnn_user\Miniconda3\envs\hnn\Library\bin' ; \
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions installer/windows/native_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This method will run HNN without using virtualization, meaning the GUI may feel more responsive and simulations may run slightly faster. However, there is a possibility that differences in the base environment may require additional troubleshooting. Thus, it is best suited for advanced users, and we recommend the [Docker-based install instructions](README.md).

With this method, a [PowerShell install script](hnn.ps1) will manage downloading all prerequisites, including Python (Anaconda), NEURON, and Git for Windows.
With this method, a [PowerShell install script](hnn-windows.ps1) will manage downloading all prerequisites, including Python (Anaconda), NEURON, and Git for Windows.

## Requirements

Expand All @@ -20,19 +20,19 @@ The PowerShell script used below will create a new directory called "hnn" in the

```powershell
cd hnn
powershell.exe -ExecutionPolicy Bypass -File .\installer\windows\hnn.ps1
powershell.exe -ExecutionPolicy Bypass -File .\installer\windows\hnn-windows.ps1
```

OR to download and run the script from a url:

```powershell
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/jonescompneurolab/hnn/master/installer/windows/hnn.ps1'))"
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/jonescompneurolab/hnn/master/installer/windows/hnn-windows.ps1'))"
```

OR from a powershell prompt:

```powershell
Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/jonescompneurolab/hnn/master/installer/windows/hnn.ps1'))
Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/jonescompneurolab/hnn/master/installer/windows/hnn-windows.ps1'))
```

- There will be a permission prompt to install Microsoft MPI and a couple of terminal windows will
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-travis-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ powershell -command "(New-Object System.Net.WebClient).DownloadFile('https://git
rm -f msmpisetup.exe

echo "Running HNN Windows install script..."
powershell.exe -ExecutionPolicy Bypass -File ./installer/windows/hnn.ps1
powershell.exe -ExecutionPolicy Bypass -File ./installer/windows/hnn-windows.ps1
# add miniconda python to the path
export PATH=$PATH:$HOME/Miniconda3/Scripts
export PATH=$HOME/Miniconda3/envs/hnn/:$PATH
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-travis-wsl.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Write-Host "Configuring Ubuntu WSL..."
& .\Ubuntu\Ubuntu1804.exe config --default-user hnn_user

# remove windows newlines
& wsl -- bash -ec "dos2unix /home/hnn_user/hnn/scripts/* /home/hnn_user/hnn/installer/ubuntu/installer.sh /home/hnn_user/hnn/installer/docker/hnn_envs"
& wsl -- bash -ec "dos2unix /home/hnn_user/hnn/scripts/* /home/hnn_user/hnn/installer/ubuntu/hnn-ubuntu.sh /home/hnn_user/hnn/installer/docker/hnn_envs"

Write-Host "Installing HNN in Ubuntu WSL..."
& wsl -- bash -ec "cd /home/hnn_user/hnn && source scripts/utils.sh && export LOGFILE=ubuntu_install.log && TRAVIS_TESTING=1 installer/ubuntu/installer.sh || script_fail"
& wsl -- bash -ec "cd /home/hnn_user/hnn && source scripts/utils.sh && export LOGFILE=ubuntu_install.log && TRAVIS_TESTING=1 installer/ubuntu/hnn-ubuntu.sh || script_fail"

if (!$?) {
exit 1
Expand Down

0 comments on commit 57a305b

Please sign in to comment.