summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-06-17 14:32:37 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-06-17 14:32:37 +0000
commit651beb5daed4b24cda4e66bb81b07392cef9b9f9 (patch)
treed7b4f059b47219820ab738452f51bd82d185bc4c /x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
parentalpha/ia64/s390/sh/sparc stable wrt #408993 (diff)
downloadgentoo-2-651beb5daed4b24cda4e66bb81b07392cef9b9f9.tar.gz
gentoo-2-651beb5daed4b24cda4e66bb81b07392cef9b9f9.tar.bz2
gentoo-2-651beb5daed4b24cda4e66bb81b07392cef9b9f9.zip
rework install-script (fix permissions and doc dest)
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch')
-rw-r--r--x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch56
1 files changed, 38 insertions, 18 deletions
diff --git a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
index fd9ae786412f..040d435bc797 100644
--- a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
+++ b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
@@ -3,36 +3,56 @@
@@ -1,5 +1,6 @@
#!/bin/sh
startdir=$1
-+version=0.7.2
++version=0.7.2.2
if [ $(echo $1|wc -w) -eq 0 ];then
echo "Usage: install.sh /path/to"
-@@ -14,17 +15,20 @@
- mkdir -p $startdir/bin/ || return 1
- install -m0755 wbarconf $startdir/bin/ || return 1
+@@ -8,29 +9,28 @@
+ exit 1
+ fi
+
+-echo "Installing in to $startdir..."
++echo "Installing in to ${startdir}..."
+
++cd "$(dirname "$(readlink -f "$0")")" || exit 1
+
+-mkdir -p $startdir/bin/ || return 1
+-install -m0755 wbarconf $startdir/bin/ || return 1
++mkdir -p "${startdir}"/bin/ || exit 1
++install -m0755 wbarconf "${startdir}"/bin/ || exit 1
-mkdir -p $startdir/share/wbarconf/
-install -m0644 README $startdir/share/wbarconf/ || return 1
-install -m0644 COPYING $startdir/share/wbarconf/ || return 1
-+mkdir -p $startdir/share/doc/wbarconf-$version/wbarbacks/
-+install -m0644 README $startdir/share/doc/wbarconf-$version/ || return 1
-+install -m0644 wbarbacks/README $startdir/share/doc/wbarconf-$version/wbarbacks/ || return 1
++mkdir -p "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
++install -m0644 README "${startdir}"/share/doc/wbarconf-${version}/ || exit 1
++install -m0644 wbarbacks/README "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
- mkdir -p $startdir/share/locale/ || return 1
+-mkdir -p $startdir/share/locale/ || return 1
-cp -av locale/* $startdir/share/locale/ || return 1
-+cp -dpRv locale/* $startdir/share/locale/ || return 1
- chmod 0755 -R $startdir/share/ || return 1
- find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
-+
-+mkdir -p $startdir/share/wbarconf/
- install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
+-chmod 0755 -R $startdir/share/ || return 1
+-find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
+-install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
++find . -type d -name LC_MESSAGES -exec mkdir -p "${startdir}/share/{}" \; || exit 1
++find . -type f -name wbarconf.mo -exec install -m0644 '{}' "${startdir}/share/{}" \; || exit 1
-cp -av wbarbacks $startdir/share/wbarconf/ || return 1
-+mkdir -p $startdir/share/wbarconf/wbarbacks/
-+cp -dpRv wbarbacks/*.png $startdir/share/wbarconf/wbarbacks/ || return 1
- chmod 0655 -R $startdir/share/wbarconf/ || return 1
+-chmod 0655 -R $startdir/share/wbarconf/ || return 1
++mkdir -p "${startdir}"/share/wbarconf/wbarbacks/ || exit 1
++install -m0644 messages.pot "${startdir}"/share/wbarconf/ || exit 1
++find ./wbarbacks -type f -name "*.png" -exec install -m0644 '{}' "${startdir}/share/wbarconf/{}" \; || exit 1
+
+-mkdir -p $startdir/share/pixmaps/
+-install -m0644 wbarconf.png $startdir/share/pixmaps/ || return 1
++mkdir -p "${startdir}"/share/pixmaps/ || exit 1
++install -m0644 wbarconf.png "${startdir}"/share/pixmaps/ || exit 1
+
+-mkdir -p $startdir/share/applications/
+-install -m0644 wbarconf.desktop $startdir/share/applications/ || return 1
++mkdir -p "${startdir}"/share/applications/ || exit 1
++install -m0644 wbarconf.desktop "${startdir}"/share/applications/ || exit 1
- mkdir -p $startdir/share/pixmaps/
+ echo "Installation complete."
--- wbarconf/wbarconf.desktop
+++ wbarconf/wbarconf.desktop
@@ -2,10 +2,10 @@