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

Some cleanup for ubuntu 11.10 #44

Merged
merged 1 commit into from Apr 24, 2012
Merged

Some cleanup for ubuntu 11.10 #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions install.sh
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ questions(){
read lipsync_dir_remote 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 if ssh -i /home/${username}/.ssh/id_dsa -p ${port} -o "KbdInteractiveAuthentication=no" -o "PasswordAuthentication=no" ${username}@${remote_server} echo "hello" > /dev/null
then then
echo " ssh key exists here and on server, skipping key generation and transfer steps" echo " ssh key exists here and on server, skipping key generation and transfer steps"
Expand Down Expand Up @@ -124,7 +124,7 @@ ssh.keygen(){
fi fi
} }


build.conf(){ build_conf(){
echo -n "* Creating lipsyncd config..." echo -n "* Creating lipsyncd config..."
sed etc/lipsyncd_template > etc/lipsyncd \ sed etc/lipsyncd_template > etc/lipsyncd \
-e 's|LSLOCDIR|'$lipsync_dir_local/'|g' \ -e 's|LSLOCDIR|'$lipsync_dir_local/'|g' \
Expand All @@ -146,6 +146,9 @@ deploy(){
if [ -x /usr/local/bin/lsyncd ]; then if [ -x /usr/local/bin/lsyncd ]; then
ln -s /usr/local/bin/lsyncd /usr/local/bin/lipsyncd ln -s /usr/local/bin/lsyncd /usr/local/bin/lipsyncd
fi fi
if [ -x /usr/bin/lsyncd ]; then
ln -s /usr/bin/lsyncd /usr/local/bin/lipsyncd
fi
echo "done" echo "done"


echo -n " > /etc/init.d/lipsyncd..." echo -n " > /etc/init.d/lipsyncd..."
Expand Down Expand Up @@ -222,8 +225,8 @@ if [ "${1}" = "uninstall" ]; then
exit 0 exit 0
else else
questions questions
ssh.keygen ssh_keygen
build.conf build_conf
deploy deploy
initial_sync initial_sync
fi fi
Expand All @@ -234,4 +237,4 @@ fi
echo "lipsync setup complete, starting lipsyncd..." echo "lipsync setup complete, starting lipsyncd..."
start start


exit 0 exit 0