Permalink
Browse files

do not start app in postinst, installation messages cleanup

  • Loading branch information...
pulpofred
pulpofred committed Apr 5, 2016
1 parent 651e648 commit 33ef882ac2e08c313f4b984d6712d4637948de4b
Showing with 7 additions and 5 deletions.
  1. +5 −4 fruho/main.tcl
  2. +2 −1 fruhod/exclude/fruhod.postinst
@@ -182,12 +182,13 @@ proc main {} {
main-exit nosave
}
if {$params(add-launcher)} {
puts stderr [log Adding Desktop Launcher]
log Adding Desktop Launcher
unix add-launcher fruho
puts stderr "Fruho shortcut added to your desktop"
main-exit nosave
}
if {$params(remove-launcher)} {
puts stderr [log Removing Desktop Launcher]
log Removing Desktop Launcher
unix remove-launcher fruho
main-exit nosave
}
@@ -284,7 +285,7 @@ proc main-generate-keys {} {
puts stderr [log Generating RSA keys]
set privkey [ovpndir fruho client.key]
if {[file exists $privkey]} {
puts stderr [log RSA key $privkey already exists]
log RSA key $privkey already exists
} else {
if {![generate-rsa $privkey]} {
puts stderr [log Could not generate RSA keys]
@@ -296,7 +297,7 @@ proc main-generate-keys {} {
}
set csr [ovpndir fruho client.csr]
if {[file exists $csr]} {
puts stderr [log CSR $csr already exists]
log CSR $csr already exists
} else {
set cn [generate-cn]
if {![generate-csr $privkey $csr $cn]} {
@@ -31,5 +31,6 @@ if [ -x /usr/local/bin/fruho.bin ]; then
/usr/local/bin/fruho.bin --add-launcher
# Run fruho client. fruho client responsible for dropping root privileges and logging to ~/.fruho/fruho.log
/usr/local/bin/fruho
# Refrain from running in postinst - too problematic on distros other than Debian/Ubuntu
# /usr/local/bin/fruho
fi

0 comments on commit 33ef882

Please sign in to comment.