Skip to content

Commit c54d820

Browse files
committed
Update instructions on how to install pash and add canary CI
1 parent 7596f62 commit c54d820

File tree

5 files changed

+46
-27
lines changed

5 files changed

+46
-27
lines changed

.github/workflows/canary.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Distribution canary
2+
3+
on:
4+
# push:
5+
schedule:
6+
- cron: '20 13 * * *'
7+
8+
jobs:
9+
pash:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
os:
14+
- ubuntu-20.04
15+
16+
runs-on: ${{ matrix.os }}
17+
18+
steps:
19+
- name: Install PaSh using the up script and run tests
20+
run: |
21+
wget https://raw.githubusercontent.com/binpash/pash/main/scripts/up.sh
22+
## Inspect it if you wish
23+
export PASH_TOP="$PWD/pash/"
24+
cd pash
25+
"$PASH_TOP/pa.sh" -c "echo hi"
26+
"$PASH_TOP/evaluation/tests/test_evaluation_scripts.sh"
27+

README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ Jump to [docs/tutorial](docs/tutorial/) for a longer tutorial.
2626

2727
## Installation
2828

29-
On Ubuntu, Fedora, and Debian run `curl up.binpa.sh | sh` to set up PaSh.
29+
On Ubuntu, Fedora, and Debian run the following to set up PaSh.
30+
```sh
31+
wget https://raw.githubusercontent.com/binpash/pash/main/scripts/up.sh
32+
sh up.sh
33+
export PASH_TOP="$PWD/pash/"
34+
## Run PaSh with echo hi
35+
"$PASH_TOP/pa.sh" -c "echo hi"
36+
```
3037

3138
For more details, manual installation, or other platforms see [installation instructions](./docs/install).
3239

compiler/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from util import *
1010

1111
## Global
12-
__version__ = "0.12" # FIXME add libdash version
12+
__version__ = "0.12.1" # FIXME add libdash version
1313
GIT_TOP_CMD = [ 'git', 'rev-parse', '--show-toplevel', '--show-superproject-working-tree']
1414
if 'PASH_TOP' in os.environ:
1515
PASH_TOP = os.environ['PASH_TOP']

docs/install/README.md

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Installation
22

3-
On Ubuntu, Fedora, Debian, or Arch, run `curl up.pash.ndr.md | sh` to get PaSh up and running.
3+
On Ubuntu, Fedora, Debian, or Arch, run the following to get PaSh up and running.
4+
```sh
5+
wget https://raw.githubusercontent.com/binpash/pash/main/scripts/up.sh
6+
sh up.sh
7+
export PASH_TOP="$PWD/pash/"
8+
## Run PaSh with echo hi
9+
"$PASH_TOP/pa.sh" -c "echo hi"
10+
```
411

512
If on other environments or prefer manual setup, there are essentially three steps required to set PaSh up:
613
1. Clone repo: `git clone [email protected]:binpash/pash.git`
@@ -19,28 +26,12 @@ The following steps clone the repo, set up dependencies (e.g., compilers), and t
1926

2027
```sh
2128
git clone [email protected]:binpash/pash.git
22-
sudo pash/scripts/distro-deps.sh
29+
./pash/scripts/distro-deps.sh
2330
./pash/scripts/setup-pash.sh
2431
```
2532

2633
These scripts have been tested on Ubuntu, Fedora, Debian, and Arch.
2734

28-
### Manual Setup
29-
30-
Use the system's package manager to install the following packages (some of which might already be installed in your system):
31-
32-
```
33-
automake bc bsdmainutils curl gcc git libffi-dev libtool locales locales-all m4 netcat-openbsd pkg-config python python3 python3-pip python3-setuptools python3-testresources sudo wamerican-insane wget
34-
```
35-
36-
Then clone the PaSh repository and run `setup-pash.sh` as follows:
37-
38-
```sh
39-
git clone [email protected]:binpash/pash.git
40-
./pash/scripts/setup-pash.sh
41-
```
42-
43-
As noted at the end of `setup-pash.sh`, make sure you set `PASH_TOP` pointing to the absolute path of the directory `pa.sh` resides (you can optionally place that in your `PATH`).
4435

4536
### Docker Setup
4637

scripts/up.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@ if [ "$PLATFORM" = "darwin" ]; then
1212
exit 1
1313
fi
1414

15-
set +e
16-
git clone [email protected]:binpash/pash.git
17-
if [ $? -ne 0 ]; then
18-
echo 'SSH clone failed; attempting HTTPS'
19-
git clone https://github.com/binpash/pash.git
20-
fi
21-
set -e
15+
git clone https://github.com/binpash/pash.git
2216

2317
if [ $(groups $(whoami) | grep -c "sudo\|root\|admin") -ge 1 ]; then
2418
# only run this if we are in the sudo group (or it's doomed to fail)

0 commit comments

Comments
 (0)