Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #44 from robertleeplummerjr/master

Some cleanup for ubuntu 11.10
  • Loading branch information...
commit 38095f5d753ad5dd9e30385d94c2ff10b0f50943 2 parents 27ea1f9 + 06dd473
@philcryer authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 install.sh
View
11 install.sh
@@ -62,7 +62,7 @@ questions(){
read lipsync_dir_remote
}
-ssh.keygen(){
+ssh_keygen(){
if ssh -i /home/${username}/.ssh/id_dsa -p ${port} -o "KbdInteractiveAuthentication=no" -o "PasswordAuthentication=no" ${username}@${remote_server} echo "hello" > /dev/null
then
echo " ssh key exists here and on server, skipping key generation and transfer steps"
@@ -124,7 +124,7 @@ ssh.keygen(){
fi
}
-build.conf(){
+build_conf(){
echo -n "* Creating lipsyncd config..."
sed etc/lipsyncd_template > etc/lipsyncd \
-e 's|LSLOCDIR|'$lipsync_dir_local/'|g' \
@@ -146,6 +146,9 @@ deploy(){
if [ -x /usr/local/bin/lsyncd ]; then
ln -s /usr/local/bin/lsyncd /usr/local/bin/lipsyncd
fi
+ if [ -x /usr/bin/lsyncd ]; then
+ ln -s /usr/bin/lsyncd /usr/local/bin/lipsyncd
+ fi
echo "done"
echo -n " > /etc/init.d/lipsyncd..."
@@ -223,8 +226,8 @@ if [ "${1}" = "uninstall" ]; then
exit 0
else
questions
- ssh.keygen
- build.conf
+ ssh_keygen
+ build_conf
deploy
initial_sync
fi
Please sign in to comment.
Something went wrong with that request. Please try again.