revert back to pre .sh fix changes

2 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b40af83d0f5b..e17e35fdd85a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = docfetcher
 	pkgdesc = A java open source desktop search application
 	pkgver = 1.1.19
-	pkgrel = 2
+	pkgrel = 1
 	url = http://docfetcher.sourceforge.net/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index fd48c90118a1..fd68a3bdd5fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=docfetcher
 _name=DocFetcher
 pkgver=1.1.19
-pkgrel=2
+pkgrel=1
 _gtkver=gtk3 # variable that controls whether GTK2 or 3(default) is to be used.
 pkgdesc="A java open source desktop search application"
 arch=('i686' 'x86_64')
@@ -46,21 +46,21 @@ package() {
   rm "Readme.txt"
 
   # Copy files to destination
-  #prefix="${pkgdir}/usr/share/${pkgname}"
-  install -d "${pkgdir}/usr/share/${pkgname}"
+  prefix="${pkgdir}/usr/share/${pkgname}"
+  install -d "${prefix}"
   for file in *; do
-    cp -a "${file}" "${pkgdir}/usr/share/${pkgname}/${file}"
+    cp -a "${file}" "${prefix}/${file}"
   done
-  find "${pkgdir}/usr/share/${pkgname}" -type d -exec chmod 0755 {} \;
-  find "${pkgdir}/usr/share/${pkgname}" -type f -exec chmod 0644 {} \;
+  find "${prefix}" -type d -exec chmod 0755 {} \;
+  find "${prefix}" -type f -exec chmod 0644 {} \;
   
   # make start scripts executable
-  chmod +x ${pkgdir}/usr/share/${pkgname}/DocFetcher-GTK*.sh
+  chmod +x ${prefix}/DocFetcher-GTK*.sh
   
   # symlink one or other of the startup scripts for GTK2 or GTK3(default)
   if [ $_gtkver == 'gtk3' ]; then
-    ln -s "${pkgdir}/usr/share/${pkgname}/DocFetcher-GTK3.sh" "${pkgdir}/usr/share/${pkgname}/DocFetcher.sh"
+    ln -s "${prefix}/DocFetcher-GTK3.sh" "${prefix}/DocFetcher.sh"
   elif [ $_gtkver == 'gtk2' ]; then
-    ln -s "${pkgdir}/usr/share/${pkgname}/DocFetcher-GTK2.sh" "${pkgdir}/usr/share/${pkgname}/DocFetcher.sh"
+    ln -s "${prefix}/DocFetcher-GTK2.sh" "${prefix}/DocFetcher.sh"
   fi
 }