diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2004-12-31 12:54:27 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2004-12-31 12:54:27 +0000 |
| commit | 489549ad6b4c7b61900fc6aa2226a42ead35d7a5 (patch) | |
| tree | ce8f8b7a5a0f39fadffa4f2e2a96fb2a66e3f865 /net-im | |
| parent | Removed basc from package mask. #76123 (diff) | |
| download | historical-489549ad6b4c7b61900fc6aa2226a42ead35d7a5.tar.gz historical-489549ad6b4c7b61900fc6aa2226a42ead35d7a5.tar.bz2 historical-489549ad6b4c7b61900fc6aa2226a42ead35d7a5.zip | |
update to wrapper when there is no ~/.Skype
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/skype/Manifest | 4 | ||||
| -rw-r--r-- | net-im/skype/files/sDaemonWrapper | 18 |
3 files changed, 15 insertions, 13 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 718560771faa..830ba98059c0 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.22 2004/12/30 11:33:31 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.23 2004/12/31 12:54:27 humpback Exp $ + + 31 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>; files/sDaemonWrapper: + Change to wrapper script to fix no startup when there is no ~/.Skype . Thanks + to Alexander Skwar in Bug 76152. *skype-0.93.0.3-r2 (30 Dec 2004) diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest index d323dc72ceba..8022bada0e8c 100644 --- a/net-im/skype/Manifest +++ b/net-im/skype/Manifest @@ -1,5 +1,5 @@ -MD5 68a9e157268f7f248c88d29d6b769e4c ChangeLog 4331 +MD5 8db976c454b5aeb6b73c4fde632ed647 ChangeLog 4526 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488 MD5 410af8237887aac7569ff2db303f22e0 skype-0.93.0.3-r2.ebuild 3174 MD5 1d81e190261e1a101fff0ecacaaa833d files/digest-skype-0.93.0.3-r2 211 -MD5 b59b4eab9520b2fcb36b5b036a39c4ec files/sDaemonWrapper 1718 +MD5 5da68017f6291806b14012eeecd885c9 files/sDaemonWrapper 1654 diff --git a/net-im/skype/files/sDaemonWrapper b/net-im/skype/files/sDaemonWrapper index 89d349468923..de5cedf6a070 100644 --- a/net-im/skype/files/sDaemonWrapper +++ b/net-im/skype/files/sDaemonWrapper @@ -9,30 +9,29 @@ shellcheck1=` which artsshell 2> /dev/null ` shellcheck2=` which esd 2> /dev/null ` artsdcheck=` ps x | grep artsd | grep -v grep ` esdcheck=` ps x | grep "esd ." | grep -v grep ` -skypecmd="${progpath}/${progname}.bin" +skypecmd="${progpath}${progname}.bin" wrapsound="yes" [ "$1" == "oss" ] && wrapsound="no" +[ -d "$(dirname "${logfile}")" ] || mkdir "$(dirname "${logfile}")" + echo "===== " `date` " =====" > ${logfile} if [[ -z ${shellcheck1} && -z ${shellcheck2} ]] then echo "No installed artsshell or esd found" echo "Assuming you're running no sound daemon" - echo "Starting ${progname} without a sound wrapper" - echo "Starting ${progname} without a sound wrapper" >> ${logfile} + echo "Starting ${progname} without a sound wrapper" | tee --append "${logfile}" else if [[ ${wrapsound} == "yes" && ${shellcheck1} == ${KDEDIR}/bin/artsshell && -n ${artsdcheck} ]] then echo "Running artsd found" - echo "Starting artsd wrapped ${progname}" - echo "Starting artsd wrapped ${progname}" >> ${logfile} + echo "Starting artsd wrapped ${progname}" | tee ---append "${logfile}" skypecmd="artsdsp -m ${skypecmd}" elif [[ ${wrapsound} == "yes" && ${shellcheck2} == /usr/bin/esd && -n ${esdcheck} ]] then echo "Running esd found" - echo "Starting esd wrapped ${progname}" - echo "Starting esd wrapped ${progname}" >> ${logfile} + echo "Starting esd wrapped ${progname}" | tee --append "${logfile}" skypecmd="esddsp ${skypecmd}" else if [ ${wrapsound} == "yes" ] @@ -41,8 +40,7 @@ else else echo "Use of sound-daemon disabled" fi - echo "Starting ${progname} without sound daemon" - echo "Starting ${progname} without sound daemon" >> ${logfile} + echo "Starting ${progname} without sound daemon" | tee --append "${logfile}" fi fi @@ -50,4 +48,4 @@ echo "${skypecmd} ${progopts}" >> ${logfile} echo "==========================================" ${skypecmd} ${progopts} >> ${logfile} 2>> ${logfile} -exit 0 +exit $? |