summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromega <marco.biasco@gmail.com>2009-05-03 15:17:52 +0200
committeromega <marco.biasco@gmail.com>2009-05-03 15:17:52 +0200
commitebc7cc527b70e08a9e02ff712b1106ac6a45efd7 (patch)
treef04415f2d2b045d4eda331f2efb2e88d51da738f
parent3b5ade0ddcbc06885004772a6e767c6f6a31a3c1 (diff)
downloadscripts-ebc7cc527b70e08a9e02ff712b1106ac6a45efd7.tar.gz
scripts-ebc7cc527b70e08a9e02ff712b1106ac6a45efd7.tar.bz2
Fixed problem with ccsm/fusion-icon (see README:problem)
-rwxr-xr-xREADME2
-rwxr-xr-xgit-compiz29
-rw-r--r--po/de.po2
-rw-r--r--po/en.po2
-rw-r--r--po/it.po2
5 files changed, 30 insertions, 7 deletions
diff --git a/README b/README
index b226487..e5c19f4 100755
--- a/README
+++ b/README
@@ -92,6 +92,8 @@ fix: sudo ln -s /usr/lib/libGL.so.xxx /usr/lib/libGL.so where xxx is version
problem: /bin/sh: /bin/moc: No such file or directory
fix: sudo ln -s /usr/bin/moc /bin/moc
+problem: launching ccsm/fusion-icon there are errors (example: missing module)
+fix: ./git-compiz --fix-python
Help
====
diff --git a/git-compiz b/git-compiz
index 4aaa715..4e8b032 100755
--- a/git-compiz
+++ b/git-compiz
@@ -26,6 +26,7 @@ else
source po/$LC_USER.po
fi
+## Data files
# check if files to import exist, then import them
if [ ! -f $0.def ]; then
echo $ERROR_DEF_FILE
@@ -46,6 +47,14 @@ test -f $0.local && source $0.local
LOG_FILE=/tmp/`echo $0 | sed -e s,./,,`-$$.log
+## Check arch for libdir
+ARCH=`uname -m`
+if [ $ARCH == "x86_64" ]; then
+ LIBDIR=lib64
+else
+ LIBDIR=lib
+fi
+
## Help menu'
help_me()
{
@@ -102,6 +111,16 @@ echo $INFO_OK
exit 1
}
+## Fix Python path
+fix_python()
+{
+echo -n $INFO_FIX_PYTHON
+if [ -d $DESTDIR$PREFIX/$LIBDIR/python2.6/dist-packages -a ! -f $DESTDIR$PREFIX/$LIBDIR/python2.6/dist-packages/compiz_path.pth ]; then
+ root bash -c "echo $DESTDIR$PREFIX/$LIBDIR/python2.6/site-packages >> $DESTDIR$PREFIX/$LIBDIR/python2.6/dist-packages/compiz_path.pth"
+fi
+echo $INFO_OK
+exit 1
+}
## Check and install dependencies for your distro (if it's supported)
check_distro_dependencies()
@@ -214,6 +233,9 @@ for singlearg in $ARGS_SCRIPT; do
users/klange/headtracking
"
;;
+ --fix-python)
+ fix_python;
+ ;;
--fix-startup)
fix_startup;
;;
@@ -739,13 +761,6 @@ fi
build_wrapper $b "-D CMAKE_BUILD_TYPE=RELEASE -D BUILD_PYTHON_SUPPORT=ON"
}
-## Support for Suse/Fedora x64
-if [ -f /etc/SuSE-release -o -f /etc/fedora-release ] && [ x`arch` == x"x86_64" ]; then
- LIBDIR=lib64
-else
- LIBDIR=lib
-fi
-
logcmd echo
logcmd echo ">>> G I T - C O M P I Z <<<"
printinfo space
diff --git a/po/de.po b/po/de.po
index f63581b..27146ad 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,6 +20,7 @@ Installationsoptionen:\n
Optionale Funktionen:\n
--check \t\t\t\t Überprüft, ob Compiz Fusion auf diesem System/Setup läuft\n
--check-dep \t\t\t\t Überprüft, ob alle Abhängigkeiten zum Kompilieren erfüllt sind\n
+ --fix-python \t\t\t\t Update python dateien\n
--fix-startup \t\t\t\t Füge Fusion-Icon zum Autostart hinzu\n
--skip-build \t\t\t\t Nur installieren - kein kompilieren\n
--skip-install \t\t\t Nur updaten - keine Installation\n
@@ -73,6 +74,7 @@ INFO_CONFIGURE="Konfiguriere neue Version"
INFO_DOWNLOAD="Lade %s"
INFO_ERROR="Fehler!"
INFO_EXTRACT="Extrahiere %s"
+INFO_FIX_PYTHON="Update python dateien..."
INFO_FIX_STARTUP="Passe Autostart an..."
INFO_GWM="Die Aktivierung von Compiz über Simple-CCSM funktioniert nun"
INFO_INSTALL="Installiere neue Version"
diff --git a/po/en.po b/po/en.po
index f3070ea..ee73ca8 100644
--- a/po/en.po
+++ b/po/en.po
@@ -22,6 +22,7 @@ Optional Features:\n
\t\t\t\t\t your system/setup\n
--check-dep \t\t\t\t Check dependencies required to compile\n
\t\t\t\t\t compiz\n
+ --fix-python \t\t\t\t Update python path\n
--fix-startup \t\t\t\t Add Fusion-Icon to startup session\n
--skip-build \t\t\t\t Install only - do NOT build\n
--skip-install \t\t\t Update only - do NOT install\n
@@ -76,6 +77,7 @@ INFO_CONFIGURE="Configuring new version"
INFO_DOWNLOAD="Downloading %s"
INFO_ERROR="FAIL!"
INFO_EXTRACT="Extracting %s"
+INFO_FIX_PYTHON="Updating python path..."
INFO_FIX_STARTUP="Fixing startup session..."
INFO_GWM="Enabling Compiz via Simple-CCSM will now work"
INFO_INSTALL="Installing new version"
diff --git a/po/it.po b/po/it.po
index 94019a4..b6cbe9e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,6 +19,7 @@ Opzioni di installazione:\n
Opzioni aggiuntive:\n
--check \t\t\t\t Verifica se Compiz può essere eseguito sul tuo pc\n
--check-dep \t\t\t\t Verifica che siano installate le dipendenze richieste per compilare Compiz\n
+ --fix-python \t\t\t\t Aggiorna il percorso di python\n
--fix-startup \t\t\t\t Aggiunge Fusion-Icon alla sessione d'avvio\n
--skip-build \t\t\t\t Installa soltanto - non compila\n
--skip-install \t\t\t Aggiorna soltanto - non installa\n
@@ -72,6 +73,7 @@ INFO_CONFIGURE="Sto configurando la nuova versione"
INFO_DOWNLOAD="Sto scaricando %s"
INFO_ERROR="Fallito!"
INFO_EXTRACT="Sto estraendo %s"
+INFO_FIX_PYTHON="Sto sistemando python..."
INFO_FIX_STARTUP="Sto sistemando la sessione d'avvio..."
INFO_GWM="Adesso puoi attivare Compiz utilizzando Simple-CCSM"
INFO_INSTALL="Sto installando la nuova versione"