diff --git a/adobe-flash.sh b/adobe-flash.sh index ca59a37..6c39f4f 100755 --- a/adobe-flash.sh +++ b/adobe-flash.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Adobe Flash Player" - +./apt-update.sh ./installed.sh flashplugin-nonfree $name && exit if sudo apt-get install flashplugin-nonfree -y then diff --git a/adobe-reader.sh b/adobe-reader.sh index dc26e87..efc496b 100755 --- a/adobe-reader.sh +++ b/adobe-reader.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Adobe-Reader" - +./apt-update.sh ./installed.sh adobereader-deu $name && exit URL="ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/9.1/deu/AdbeRdr9.1.0-1_i386linux_deu.deb" wget -c $URL diff --git a/anki.sh b/anki.sh index 35ad798..c9e96ec 100755 --- a/anki.sh +++ b/anki.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Anki" - +./apt-update.sh ./installed.sh anki $name && exit URL="http://ankisrs.net/download/mirror/anki-2.0.31.deb" wget -c $URL diff --git a/apt-update.sh b/apt-update.sh new file mode 100755 index 0000000..b67aba3 --- /dev/null +++ b/apt-update.sh @@ -0,0 +1,23 @@ +#!/bin/bash +TEXTDOMAIN=la-tools +TEXTDOMAINDIR=./ + +#http://stackoverflow.com/a/12199798 +convertsecs() { + ((h=${1}/3600)) + ((m=(${1}%3600)/60)) + ((s=${1}%60)) + printf "%02d:%02d:%02d\n" $h $m $s +} + +last=$(stat -c %Y /var/cache/apt/) +date=$(date +%s) +diff=$(($date-$last)) +wort=$(convertsecs $diff) +if [[ $diff > 43200 ]] +then + echo $"package sources outdated" + echo $"$wort -- $diff seconds" + zenity --info --title $"package sources outdated" --text $"The last update was $wort ago. The package sources will get updated now" + sudo apt-get update -y +fi diff --git a/chromium.sh b/chromium.sh index 9f5ffc0..43d8cc0 100755 --- a/chromium.sh +++ b/chromium.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Chromium" - +./apt-update.sh ./installed.sh chromium $name && exit if sudo apt-get install chromium chromium-l10n diff --git a/de_AT.utf8/LC_MESSAGES/la-tools.mo b/de_AT.utf8/LC_MESSAGES/la-tools.mo index 224e298..f6dc3da 100644 Binary files a/de_AT.utf8/LC_MESSAGES/la-tools.mo and b/de_AT.utf8/LC_MESSAGES/la-tools.mo differ diff --git a/de_AT.utf8/LC_MESSAGES/la-tools.po b/de_AT.utf8/LC_MESSAGES/la-tools.po index 8fc817a..3a51cda 100644 --- a/de_AT.utf8/LC_MESSAGES/la-tools.po +++ b/de_AT.utf8/LC_MESSAGES/la-tools.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: la-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-01 19:08+0100\n" -"PO-Revision-Date: 2014-12-01 19:09+0100\n" +"POT-Creation-Date: 2014-12-01 20:12+0100\n" +"PO-Revision-Date: 2014-12-01 20:14+0100\n" "Last-Translator: Lukas Winkler \n" "Language-Team: \n" "Language: de\n" @@ -24,13 +24,13 @@ msgstr "" #: adobe-flash.sh:9 adobe-reader.sh:12 anki.sh:12 chromium.sh:10 #: dropbox_neu.sh:19 dropbox.sh:12 dropbox.sh:13 geogebra44.sh:11 #: geogebra44.sh:29 geogebra5.sh:11 geogebra5.sh:29 google-chrome.sh:11 -#: google-earth.sh:18 lame.sh:10 msfonts.sh:9 opera.sh:11 skype.sh:11 +#: google-earth.sh:18 lame.sh:10 msfonts.sh:10 opera.sh:11 skype.sh:11 msgid "Success" msgstr "Erfolg" #: adobe-flash.sh:9 adobe-reader.sh:12 anki.sh:12 chromium.sh:10 #: dropbox_neu.sh:19 dropbox.sh:12 geogebra44.sh:29 geogebra5.sh:29 -#: google-chrome.sh:11 google-earth.sh:18 lame.sh:10 msfonts.sh:9 opera.sh:11 +#: google-chrome.sh:11 google-earth.sh:18 lame.sh:10 msfonts.sh:10 opera.sh:11 #: skype.sh:11 #, sh-format msgid "$name successfully installed" @@ -39,18 +39,33 @@ msgstr "$name wurde erfolgreich installiert" #: adobe-flash.sh:11 adobe-reader.sh:15 anki.sh:15 chromium.sh:12 #: dropbox_neu.sh:21 dropbox.sh:16 geogebra44.sh:13 geogebra44.sh:31 #: geogebra5.sh:13 geogebra5.sh:31 google-chrome.sh:14 google-earth.sh:20 -#: lame.sh:12 msfonts.sh:11 opera.sh:13 skype.sh:13 +#: lame.sh:12 msfonts.sh:12 opera.sh:13 skype.sh:13 msgid "Error" msgstr "Fehler " #: adobe-flash.sh:11 adobe-reader.sh:15 anki.sh:15 chromium.sh:12 #: dropbox_neu.sh:21 dropbox.sh:16 geogebra44.sh:31 geogebra5.sh:31 -#: google-chrome.sh:14 google-earth.sh:20 lame.sh:12 msfonts.sh:11 opera.sh:13 +#: google-chrome.sh:14 google-earth.sh:20 lame.sh:12 msfonts.sh:12 opera.sh:13 #: skype.sh:13 #, sh-format msgid "An error occurred while installing $name" msgstr "Bei der Installation von $name ist ein Fehler aufgetreten" +#: apt-update.sh:19 apt-update.sh:21 +msgid "package sources outdated" +msgstr "Paketquellen veraltet" + +#: apt-update.sh:20 +#, sh-format +msgid "$wort -- $diff seconds" +msgstr "$wort -- $diff Sekunden" + +#: apt-update.sh:21 +#, sh-format +msgid "The last update was $wort ago. The package sources will get updated now" +msgstr "" +"Das letzte Update war vor $wort. Die Paketquellen werden nun aktualisiert. " + #: dropbox.sh:13 msgid "Please restart Nautilus (file explorer)" msgstr "Bitte starte Nautilus neu (Dateiexplorer)" diff --git a/dropbox.sh b/dropbox.sh index 171c256..62ebf8a 100755 --- a/dropbox.sh +++ b/dropbox.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Dropbox" - +./apt-update.sh ./installed.sh dropbox $name && exit URL="https://www.dropbox.com/download?dl=packages/debian/dropbox_1.6.2_i386.deb" diff --git a/dropbox_neu.sh b/dropbox_neu.sh index a6baf45..ba813a3 100755 --- a/dropbox_neu.sh +++ b/dropbox_neu.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Dropbox" - +./apt-update.sh ./installed.sh dropbox $name && exit sources=$(cat /etc/apt/sources.list.d/dropbox.list) diff --git a/geogebra44.sh b/geogebra44.sh index 82a1e0d..6e6d2a8 100755 --- a/geogebra44.sh +++ b/geogebra44.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Geogebra 4" - +./apt-update.sh sudo apt-get update if dpkg -l | grep geogebra44 | grep ii then diff --git a/geogebra5.sh b/geogebra5.sh index 2698a2f..3f5bda6 100755 --- a/geogebra5.sh +++ b/geogebra5.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Geogebra 5" - +./apt-update.sh sudo apt-get update if dpkg -l | grep geogebra5 | grep ii then diff --git a/google-chrome.sh b/google-chrome.sh index eac3363..653e6ec 100755 --- a/google-chrome.sh +++ b/google-chrome.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Google Chrome" - +./apt-update.sh ./installed.sh google-chrome $name && exit URL="https://dl.google.com/linux/direct/google-chrome-stable_current_i386.deb" wget -c $URL diff --git a/google-earth.sh b/google-earth.sh index 8c4624e..0b082dc 100755 --- a/google-earth.sh +++ b/google-earth.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Google Earth" - +./apt-update.sh ./installed.sh google-chrome $name && exit sources=$(cat /etc/apt/sources.list.d/google-earth.list) if [ "$sources" != "deb http://dl.google.com/linux/earth/deb/ stable main" ] diff --git a/la-tools.pot b/la-tools.pot index 0f128bc..26ec999 100644 --- a/la-tools.pot +++ b/la-tools.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-01 19:08+0100\n" +"POT-Creation-Date: 2014-12-01 20:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,13 +20,13 @@ msgstr "" #: adobe-flash.sh:9 adobe-reader.sh:12 anki.sh:12 chromium.sh:10 #: dropbox_neu.sh:19 dropbox.sh:12 dropbox.sh:13 geogebra44.sh:11 #: geogebra44.sh:29 geogebra5.sh:11 geogebra5.sh:29 google-chrome.sh:11 -#: google-earth.sh:18 lame.sh:10 msfonts.sh:9 opera.sh:11 skype.sh:11 +#: google-earth.sh:18 lame.sh:10 msfonts.sh:10 opera.sh:11 skype.sh:11 msgid "Success" msgstr "" #: adobe-flash.sh:9 adobe-reader.sh:12 anki.sh:12 chromium.sh:10 #: dropbox_neu.sh:19 dropbox.sh:12 geogebra44.sh:29 geogebra5.sh:29 -#: google-chrome.sh:11 google-earth.sh:18 lame.sh:10 msfonts.sh:9 opera.sh:11 +#: google-chrome.sh:11 google-earth.sh:18 lame.sh:10 msfonts.sh:10 opera.sh:11 #: skype.sh:11 #, sh-format msgid "$name successfully installed" @@ -35,18 +35,32 @@ msgstr "" #: adobe-flash.sh:11 adobe-reader.sh:15 anki.sh:15 chromium.sh:12 #: dropbox_neu.sh:21 dropbox.sh:16 geogebra44.sh:13 geogebra44.sh:31 #: geogebra5.sh:13 geogebra5.sh:31 google-chrome.sh:14 google-earth.sh:20 -#: lame.sh:12 msfonts.sh:11 opera.sh:13 skype.sh:13 +#: lame.sh:12 msfonts.sh:12 opera.sh:13 skype.sh:13 msgid "Error" msgstr "" #: adobe-flash.sh:11 adobe-reader.sh:15 anki.sh:15 chromium.sh:12 #: dropbox_neu.sh:21 dropbox.sh:16 geogebra44.sh:31 geogebra5.sh:31 -#: google-chrome.sh:14 google-earth.sh:20 lame.sh:12 msfonts.sh:11 opera.sh:13 +#: google-chrome.sh:14 google-earth.sh:20 lame.sh:12 msfonts.sh:12 opera.sh:13 #: skype.sh:13 #, sh-format msgid "An error occurred while installing $name" msgstr "" +#: apt-update.sh:19 apt-update.sh:21 +msgid "package sources outdated" +msgstr "" + +#: apt-update.sh:20 +#, sh-format +msgid "$wort -- $diff seconds" +msgstr "" + +#: apt-update.sh:21 +#, sh-format +msgid "The last update was $wort ago. The package sources will get updated now" +msgstr "" + #: dropbox.sh:13 msgid "Please restart Nautilus (file explorer)" msgstr "" diff --git a/lame.sh b/lame.sh index 4f449a9..56db376 100755 --- a/lame.sh +++ b/lame.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Lame" - +./apt-update.sh ./installed.sh lame $name && exit if sudo apt-get install lame diff --git a/msfonts.sh b/msfonts.sh index 894d1e9..a3cf27d 100755 --- a/msfonts.sh +++ b/msfonts.sh @@ -2,6 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name=$"Windows fonts" +./apt-update.sh ./installed.sh ttf-mscorefonts-installer $name && exit if sudo apt-get install ttf-mscorefonts-installer diff --git a/opera.sh b/opera.sh index 2fa9805..471099e 100755 --- a/opera.sh +++ b/opera.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Opera" - +./apt-update.sh ./installed.sh opera $name && exit URL="http://get.geo.opera.com/pub/opera/linux/1216/opera_12.16.1860_i386.deb" wget -c $URL diff --git a/skype.sh b/skype.sh index 58cf1fc..8b548e7 100755 --- a/skype.sh +++ b/skype.sh @@ -2,7 +2,7 @@ TEXTDOMAIN=la-tools TEXTDOMAINDIR=./ name="Skype" - +./apt-update.sh ./installed.sh skype $name && exit URL="http://download.skype.com/linux/skype-debian_4.2.0.13-1_i386.deb" wget -c $URL