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

Refactoring install.sh #3194

Merged
merged 8 commits into from
Sep 9, 2016
Merged

Refactoring install.sh #3194

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f81933
install.sh: Add for loop to shorten script.
kulla Sep 6, 2016
fc20fe8
install.sh: Add error message at the end.
kulla Sep 6, 2016
28a69ee
install.sh: Treat $binpath as target directory.
kulla Sep 7, 2016
f845841
install.sh: Check whether installation succeeds.
kulla Sep 7, 2016
f00b8d5
install.sh: Make success message clearer.
kulla Sep 8, 2016
81e40de
install.sh: Recommend using sudo on error.
kulla Sep 8, 2016
7f194c9
install.sh: Enhance comments of the script.
kulla Sep 8, 2016
465e4b9
install.sh: Remove -t parameter from mv command.
kulla Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions cmd/ipfs/dist/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#!/bin/sh

bin=ipfs
binpaths="/usr/local/bin /usr/bin"

# this script is currently brain dead.
# it merely tries two locations.
# in the future maybe use value of $PATH.

binpath=/usr/local/bin
if [ -d "$binpath" ]; then
mv "$bin" "$binpath/$bin"
echo "installed $binpath/$bin"
exit 0
fi
for binpath in $binpaths; do
if [ -d "$binpath" ]; then
Copy link
Member

Choose a reason for hiding this comment

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

would be nice to also check [ -w "$binpath" ] to see if we're allowed to write in the given directory.

mv "$bin" "$binpath/$bin"
Copy link
Member

Choose a reason for hiding this comment

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

We should check if this succeeds or not and not print 'installed X' if it fails.

echo "installed $binpath/$bin"
exit 0
fi
done

binpath=/usr/bin
if [ -d "$binpath" ]; then
mv "$bin" "$binpath/$bin"
echo "installed $binpath/$bin"
exit 0
fi
echo "cannot install $bin in one of the directories $binpaths"
exit 1