Sync with upstream master

This commit is contained in:
Thomas Liebetraut 2013-05-21 13:57:23 +02:00
commit 0b5eb81428
3 changed files with 30 additions and 9 deletions

View File

@ -1 +1,7 @@
Run install.sh to install the icon for all the users.
Run install.sh without any arguments to install the extension for all the users.
If you want to install the extension only for the current user, run
install.sh local
instead.

View File

@ -1,5 +1,7 @@
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
/* Olaf Leidinger <oleid@mescharet.de> 20130318 */
/* Olaf Leidinger <oleid@mescharet.de>
Thomas Liebetraut <thomas@tommie-lie.de>
*/
const Gdk = imports.gi.Gdk;
const Gio = imports.gi.Gio;
@ -192,7 +194,8 @@ const TeaTime = new Lang.Class({
function init(metadata) {
// TODO: at some point, add translations
;
let theme = imports.gi.Gtk.IconTheme.get_default();
theme.append_search_path(metadata.path);
}
let _TeaTime;

View File

@ -1,11 +1,23 @@
NAME="TeaTime@oleid.mescharet.de"
INST_DIR="$HOME/.local/share/gnome-shell-extensions/$NAME"
if [ "$1" = "local" ] ; then
INST_DIR="$HOME/.local/gnome-shell/extensions/$NAME"
SUDO=""
else
INST_DIR="/usr/share/gnome-shell/extensions/$NAME"
SUDO="sudo"
echo "Installing icon"
sudo cp utilities-teatime.svg /usr/share/icons/hicolor/scalable/apps/
sudo gtk-update-icon-cache /usr/share/icons/hicolor/
$SUDO cp utilities-teatime.svg /usr/share/icons/hicolor/scalable/apps/
$SUDO gtk-update-icon-cache /usr/share/icons/hicolor/
fi
echo "Installing extension"
mkdir -p "$INST_DIR"
$SUDO mkdir -p "$INST_DIR"
cp *.js *.json "$INST_DIR"
$SUDO cp *.js *.json "$INST_DIR"
if [ "$1" = "local" ]; then
$SUDO cp *.svg "$INST_DIR"
fi