Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow install.sh to be run without being the script dir #4547

Merged
merged 3 commits into from
Jan 6, 2018
Merged

Allow install.sh to be run without being the script dir #4547

merged 3 commits into from
Jan 6, 2018

Conversation

epheph
Copy link
Contributor

@epheph epheph commented Jan 4, 2018 •
edited
Loading

This is a very simple change, but took me a few minutes to resolve, since the documentation is specifically broken related to this.

https://ipfs.io/docs/install/#installing-from-a-prebuilt-package

...
After downloading, untar the archive, and move the ipfs binary somewhere in your executables $PATH using the install.sh script:

tar xvfz go-ipfs.tar.gz

./go-ipfs/install.sh # <-- install.sh cannot currently be run when not inside the go-ipfs directory

Test it out:
...

@epheph
Allow install.sh to be run without being the script dir
a2eb40c 
License: MIT
Signed-off-by: Scott Bigelow <epheph@gmail.com>
magik6k
magik6k reviewed Jan 5, 2018
View reviewed changes
Copy link
Member

@magik6k magik6k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that, one comment, then LGTM.

cmd/ipfs/dist/install.sh Outdated
@@ -3,7 +3,9 @@
# Installation script for ipfs. It tries to move $bin in one of the
# directories stored in $binpaths.

bin=ipfs
INSTALL_DIR=`dirname $0`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use $(..) syntax instead of backticks.

@epheph
Changing command substitution format
55d224a 
License: MIT
Signed-off-by: Scott Bigelow <epheph@gmail.com>
whyrusleeping
whyrusleeping reviewed Jan 5, 2018
View reviewed changes
cmd/ipfs/dist/install.sh Outdated
bin=ipfs
INSTALL_DIR=$(dirname $0)

bin=$INSTALL_DIR/ipfs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, one more comment. Put the value here in quotes:

bin="$INSTALL_DIR/ipfs"

Otherwise any spaces in the INSTALL_DIR path will break this

@epheph
fix bug with spaces in directory name
bc3a761 
License: MIT
Signed-off-by: Scott Bigelow <epheph@gmail.com>
@epheph
Copy link
Contributor Author

epheph commented Jan 5, 2018

Sure thing, definitely correct to quote.

2 line change, 2 bugs 😎

@whyrusleeping whyrusleeping merged commit 6a82a4a into ipfs:master Jan 6, 2018
@victorb victorb mentioned this pull request Jan 11, 2018
Closed
@victorb victorb mentioned this pull request Jan 23, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whyrusleeping whyrusleeping whyrusleeping left review comments

@magik6k magik6k magik6k approved these changes

@Kubuxu Kubuxu Awaiting requested review from Kubuxu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@epheph @whyrusleeping @magik6k