summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-10-11 10:56:19 +0200
committersibel <lesibel at free dot fr>2010-10-11 10:56:19 +0200
commit43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe (patch)
tree74e1acab066f2645840e891d9684c766002ad75d /extra
parentf0e28fbc0bf87c0d4d4eadd03cbe62083e405338 (diff)
parent473b056c8124afc9b3daeb06f5cf84342997ee7b (diff)
downloadnutyx-extra-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.gz
nutyx-extra-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.bz2
nutyx-extra-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.tar.xz
nutyx-extra-43eb8ccb76cf2eb9e59064c541dbe5c7fcaf0bbe.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
Diffstat (limited to 'extra')
-rw-r--r--extra/gestpkg-1.2/pre-install4
-rw-r--r--extra/gestpkg/pre-install3
-rw-r--r--[-rwxr-xr-x]extra/qt/post-install6
3 files changed, 8 insertions, 5 deletions
diff --git a/extra/gestpkg-1.2/pre-install b/extra/gestpkg-1.2/pre-install
index 343eab591..e0fc0092e 100644
--- a/extra/gestpkg-1.2/pre-install
+++ b/extra/gestpkg-1.2/pre-install
@@ -1,3 +1,3 @@
-if ( pkginfo -l gestpkg > /dev/null); then
- pkgrm gestpkg
+if ( pkginfo -i | grep ^"gestpkg " > /dev/null ) ; then
+ pkgrm gestpkg
fi
diff --git a/extra/gestpkg/pre-install b/extra/gestpkg/pre-install
new file mode 100644
index 000000000..f7e04387e
--- /dev/null
+++ b/extra/gestpkg/pre-install
@@ -0,0 +1,3 @@
+if ( pkginfo -i | grep ^"gestpkg-1.2 " > /dev/null ) ; then
+ pkgrm gestpkg-1.2
+fi
diff --git a/extra/qt/post-install b/extra/qt/post-install
index 37057e467..afd2d4e5e 100755..100644
--- a/extra/qt/post-install
+++ b/extra/qt/post-install
@@ -1,4 +1,4 @@
-#!/bin/bash
-if ( pkginfo -i | grep phonon > /dev/null ) ; then
- pkgrm phonon
+if ! ( pkginfo -i | grep phonon > /dev/null ) ; then
+ pkg-get depinst phonon
fi
+