marko/calibre-autoupdate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'devel' into stable

Browse Source
This commit is contained in:
Leon Gaultier 2014-04-04 19:35:56 +02:00
commit a93416d2df
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CAU_Installer
View File

@ -2,7 +2,7 @@
# Programmversion
PROGNAME=`basename $0`
VERSION="0.11"
VERSION="0.11a"
QUIET=0
func_term_output () {
@ -49,10 +49,10 @@ read -p "Wo soll der Calibre-Autoupdater installiert werden? [default /usr/local
if [ -z $UPDATER_INSTALL_LOCATION ]; then
UPDATER_INSTALL_LOCATION=/usr/local
fi
read -p "Wo befindet sich die Calibre Installation? [default /opt/calibre] " CALIBRE_INSTALL_LOCATION
read -p "Wo befindet sich die Calibre Installation? [default /opt] " CALIBRE_INSTALL_LOCATION
if [ -z $CALIBRE_INSTALL_LOCATION ]; then
CALIBRE_INSTALL_LOCATION=/opt/calibre
CALIBRE_INSTALL_LOCATION=/opt
fi
# Installationsfade in der Verzeichnishierarchie
@ -63,7 +63,7 @@ BIN=$UPDATER_INSTALL_LOCATION/bin/
func_check_dir() # Install oder Update Calibre Updater, Check ob Calibre überhaupt installiert ist
{
if test ! -d $CALIBRE_INSTALL_LOCATION ; then
if test ! -d $CALIBRE_INSTALL_LOCATION/calibre ; then
echo -e "\n\033[1;31mKeine Calibre Installation unter $CALIBRE_INSTALL_LOCATION gefunden. Installation des Updaters nicht möglich.\e[m\n"; >&2
exit 1
fi

2
calibre-autoupdate_checks.h
View File

@ -40,7 +40,7 @@ func_check_run_calibre () {
echo -e "\033[31m noch \033[32m>>$i<< \033[31m Sekunden bis zum Calibre Programmende"
sleep 1
clear
funct_term_output
func_term_output
done
kill -15 $CALIBRE_PID
return 0