Skip to content
This repository
Browse code

Merge pull request #44 from robertleeplummerjr/master

Some cleanup for ubuntu 11.10
  • Loading branch information...
commit 38095f5d753ad5dd9e30385d94c2ff10b0f50943 2 parents 27ea1f9 + 06dd473
philcryer::fak3r authored

Showing 1 changed file with 7 additions and 4 deletions. Show diff stats Hide diff stats

  1. +7 4 install.sh
11 install.sh
@@ -62,7 +62,7 @@ questions(){
62 62 read lipsync_dir_remote
63 63 }
64 64
65   -ssh.keygen(){
  65 +ssh_keygen(){
66 66 if ssh -i /home/${username}/.ssh/id_dsa -p ${port} -o "KbdInteractiveAuthentication=no" -o "PasswordAuthentication=no" ${username}@${remote_server} echo "hello" > /dev/null
67 67 then
68 68 echo " ssh key exists here and on server, skipping key generation and transfer steps"
@@ -124,7 +124,7 @@ ssh.keygen(){
124 124 fi
125 125 }
126 126
127   -build.conf(){
  127 +build_conf(){
128 128 echo -n "* Creating lipsyncd config..."
129 129 sed etc/lipsyncd_template > etc/lipsyncd \
130 130 -e 's|LSLOCDIR|'$lipsync_dir_local/'|g' \
@@ -146,6 +146,9 @@ deploy(){
146 146 if [ -x /usr/local/bin/lsyncd ]; then
147 147 ln -s /usr/local/bin/lsyncd /usr/local/bin/lipsyncd
148 148 fi
  149 + if [ -x /usr/bin/lsyncd ]; then
  150 + ln -s /usr/bin/lsyncd /usr/local/bin/lipsyncd
  151 + fi
149 152 echo "done"
150 153
151 154 echo -n " > /etc/init.d/lipsyncd..."
@@ -223,8 +226,8 @@ if [ "${1}" = "uninstall" ]; then
223 226 exit 0
224 227 else
225 228 questions
226   - ssh.keygen
227   - build.conf
  229 + ssh_keygen
  230 + build_conf
228 231 deploy
229 232 initial_sync
230 233 fi

0 comments on commit 38095f5

Please sign in to comment.
Something went wrong with that request. Please try again.