# HG changeset patch # User Samuel Trassare # Date 1330717984 28800 # Node ID f72c28df3f6c88e1d8f52a5afb66573aa88e5525 # Parent 65b49d06c6b1bfb41570b4dc5f80dde5e9695c6f boinc: edit init script diff -r 65b49d06c6b1 -r f72c28df3f6c boinc/receipt --- a/boinc/receipt Thu Mar 01 22:08:36 2012 +0100 +++ b/boinc/receipt Fri Mar 02 11:53:04 2012 -0800 @@ -9,9 +9,9 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://boinc.berkeley.edu/" WGET_URL="svn|http://boinc.berkeley.edu/svn/tags/boinc_core_release_${SVN_TAG}" - -DEPENDS="openssl libcurl wxWidgets libnotify" -BUILD_DEPENDS="subversion openssl-dev autoconf automake curl-dev \ +# The init script requires bash. +DEPENDS="openssl libcurl wxWidgets libnotify bash" +BUILD_DEPENDS="subversion openssl-dev autoconf automake curl-dev libidn-dev \ wxWidgets-dev libnotify-dev" # Rules to configure and make the package. @@ -40,14 +40,33 @@ cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp $_pkg/usr/share/boinc/boincmgr.48x48.png \ $fs/usr/share/pixmaps/boincmgr.png + rm $fs/etc/init.d/boinc-client + cp $stuff/boinc-client $fs/etc/init.d/boinc-client } post_install() { - adduser -g "BOINC User" -h /var/lib/boinc -s /bin/false -S -H -D boinc + # Check if boinc user already exists + if [ -n "`grep ^${BOINCUSER}: /etc/passwd`" ] ; then + adduser -g "BOINC User" -h /var/lib/boinc -s /bin/bash -S -H -D boinc + else + # In case boinc was previously installed: + chown -R boinc /var/lib/boinc + fi + + echo -n "Start the boinc client with \"# /etc/init.d/boinc-client start\"" + echo "" } post_remove() { - deluser boinc + echo -n "Delete user boinc and /var/lib/boinc (yes/No) ? : " + read -t 30 answer + if [ "$answer" == "yes" ]; then + deluser boinc + rm -r /var/lib/boinc + else + echo "" + echo "Leaving user boinc and /var/lib/boinc" + fi } diff -r 65b49d06c6b1 -r f72c28df3f6c boinc/stuff/applications/boincmgr.desktop --- a/boinc/stuff/applications/boincmgr.desktop Thu Mar 01 22:08:36 2012 +0100 +++ b/boinc/stuff/applications/boincmgr.desktop Fri Mar 02 11:53:04 2012 -0800 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=BOINC Manager -Exec=subox boincmgr -e /usr/bin -d /var/lib/boinc +Exec=subox boincmgr --clientdir=/usr/bin --datadir=/var/lib/boinc Icon=boincmgr Type=Application Categories=System;Application; diff -r 65b49d06c6b1 -r f72c28df3f6c osmo/stuff/osmo.desktop --- a/osmo/stuff/osmo.desktop Thu Mar 01 22:08:36 2012 +0100 +++ b/osmo/stuff/osmo.desktop Fri Mar 02 11:53:04 2012 -0800 @@ -4,6 +4,6 @@ Name[fr]=Osmo Organisateur Name[pt]=Osmo Organizador Pessoal Exec=osmo -Icon=osmo.png +Icon=osmo Type=Application Categories=Office;