Update package for geany changes and other fixes

2 files changed, 27 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eee22a208a6d..44c2a1473f32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: James An <james@jamesan.ca>
+# Maintainer: Xyem <xyem@electricjungle.org>
+# Contributor: James An <james@jamesan.ca>
 pkgname=geany-openscad
-pkgver=20140305
-pkgrel=2
+pkgver=20140503
+pkgrel=1
 pkgdesc="Syntax highlighting and auto-completion for OpenSCAD files in Geany."
 arch=('any')
 url='http://www.thingiverse.com/thing:263620'
@@ -9,8 +10,8 @@ license=('CCPL:by-sa')
 depends=('geany')
 install="$pkgname.install"
 source=('http://www.thingiverse.com/download:479705')
-md5sums=('b97833567bdc0e084ae226ca7dc0a722')
+sha256sums=('ceb2eb9dd54a879b93e6ba7645aecd668ff183d0705d07a9b863fdfa4560dac6')
 
 package() {
-    install -Dm644 'download:479705' "$pkgdir/usr/share/geany/filetypes.OpenSCAD.conf"
+  install -Dm644 'download:479705' "$pkgdir/usr/share/geany/filedefs/filetypes.OpenSCAD.conf"
 }
diff --git a/geany-openscad.install b/geany-openscad.install
index f02b7aface6f..a71f4a8c1993 100644
--- a/geany-openscad.install
+++ b/geany-openscad.install
@@ -7,29 +7,30 @@ declare -r key='OpenSCAD'
 declare -r value='*.scad'
 
 post_install() {
-    # insert filetype line if it isn't present, otherwise replace it.
-    if [ -z "`grep "^${key}=" "${file}"`" ] ; then
-        local before="`sed -n "1,/^\[${heading}]/p" "${file}"`"
-        local section="`sed "1,/^\[${heading}]/d;/^\s*$/,\\\$d" $file | \
-                        cat - <(echo "${key}=${value};") | \
-                        sort -f`"
-        local after="`sed "1,/^\[${heading}]/d;1,/^\s*$/d" "${file}"`"
+  # insert filetype line if it isn't present, otherwise replace it.
+  if [ -z "`grep "^${key}=" "${file}"`" ] ; then
+    local before="`sed -n "1,/^\[${heading}]/p" "${file}"`"
+    local section="`sed "1,/^\[${heading}]/d;/^\s*$/,\\\$d" $file | \
+                    cat - <(echo "${key}=${value};") | \
+                    sort -f`"
+    local after="`sed "1,/^\[${heading}]/d;1,/^\s*$/d" "${file}"`"
 
-        echo -e "${before}\n${section}\n\n${after}" > "${file}"
-    else
-        sed -i "s/^\(${key}=.*;\)/\1${value};/" "${file}"
-    fi
-    sed -i "s/^\(${category}=.*\)/\1${key};/" "${file}"
+    echo -e "${before}\n${section}\n\n${after}" > "${file}"
+  else
+    sed -i "s/^\(${key}=.*;\)/\1${value};/" "${file}"
+  fi
+
+  sed -i "s/^\(${category}=.*\)/\1${key};/" "${file}"
 }
 
 pre_remove() {
-    # remove the *.scad pattern from the OpenSCAD file type.
-    sed -i "s/^\(${key}=.*\)\\${value};/\1/" "${file}"
+  # remove the *.scad pattern from the OpenSCAD file type.
+  sed -i "s/^\(${key}=.*\)\\${value};/\1/" "${file}"
 
-    # if the OpenSCAD file type has no other patterns,
-    # remove it and its entry in the Script group.
-    if [ -z "`grep "^${key}=.+" "${file}"`" ] ; then
-        sed -i "/^${key}=/d" "${file}"
-        sed -i "s/^\(${category}=.*\)${key};\(.*\)$/\1\2/" "${file}"
-    fi
+  # if the OpenSCAD file type has no other patterns,
+  # remove it and its entry in the Script group.
+  if [ -z "`grep "^${key}=.+" "${file}"`" ] ; then
+      sed -i "/^${key}=/d" "${file}"
+      sed -i "s/^\(${category}=.*\)${key};\(.*\)$/\1\2/" "${file}"
+  fi
 }