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 | 4c7f43d26390b30724a5853f5e4461731992b398 (patch) | |
| tree | 00dd1980199775555179cb158655eed5ec120e03 /net-im/skype/files | |
| parent | Removed basc from package mask. #76123 (diff) | |
| download | gentoo-2-4c7f43d26390b30724a5853f5e4461731992b398.tar.gz gentoo-2-4c7f43d26390b30724a5853f5e4461731992b398.tar.bz2 gentoo-2-4c7f43d26390b30724a5853f5e4461731992b398.zip | |
update to wrapper when there is no ~/.Skype
Diffstat (limited to 'net-im/skype/files')
| -rw-r--r-- | net-im/skype/files/sDaemonWrapper | 18 |
1 files changed, 8 insertions, 10 deletions
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 $? |