diff --git a/appset-qt/PKGBUILD b/appset-qt/PKGBUILD
index 27c11f5..629ffe6 100644
--- a/appset-qt/PKGBUILD
+++ b/appset-qt/PKGBUILD
@@ -19,7 +19,7 @@ md5sums=('8658b6452e1f941af8501a6a772b6cd9'
 
 build()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}-sources
+  cd "${srcdir}/${pkgname}-${pkgver}-sources"
 
   qmake-qt4 PREFIX=/usr -Wnone
 
@@ -33,9 +33,9 @@ build()
 
 package()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}-sources
+  cd "${srcdir}/${pkgname}-${pkgver}-sources"
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
   # appset-helper daemon
-  install -D -m644 ../appset-helper.service ${pkgdir}/usr/lib/systemd/system/appset-helper.service
+  install -D -m644 ../appset-helper.service "${pkgdir}/usr/lib/systemd/system/appset-helper.service"
 }
diff --git a/broadcom-wl_v5/PKGBUILD b/broadcom-wl_v5/PKGBUILD
index 9025e66..31c639d 100644
--- a/broadcom-wl_v5/PKGBUILD
+++ b/broadcom-wl_v5/PKGBUILD
@@ -29,24 +29,24 @@ _extramodules="extramodules-${_kernmajor}-ARCH"
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
 prepare(){
-  cd broadcom-sta-${pkgver}/${_arch}
+  cd "broadcom-sta-${pkgver}/${_arch}"
 
   patch -Np1 -i "${srcdir}/distro.patch"
   patch -Np1 -i "${srcdir}/fixes.patch"
 }
 
 build() {
-    cd broadcom-sta-${pkgver}/${_arch}
+    cd "broadcom-sta-${pkgver}/${_arch}"
 
-    make -C /usr/lib/modules/${_kernver}/build M=`pwd`
+    make -C "/usr/lib/modules/${_kernver}/build" M=`pwd`
 }
 
 package() {
-    cd broadcom-sta-${pkgver}/${_arch}
+    cd "broadcom-sta-${pkgver}/${_arch}"
 
     install -D -m 644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
 
-    install -D -m 644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -D -m 644 ${srcdir}/modprobe.d "${pkgdir}/etc/modprobe.d/broadcom-wl.conf"
+    install -D -m 644 "lib/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m 644 "${srcdir}/modprobe.d" "${pkgdir}/etc/modprobe.d/broadcom-wl.conf"
 }
diff --git a/food_gui/PKGBUILD b/food_gui/PKGBUILD
index 821d5b5..2161541 100644
--- a/food_gui/PKGBUILD
+++ b/food_gui/PKGBUILD
@@ -14,16 +14,16 @@ md5sums=('f4f6df25131af05ae4ec8b03936cedc9')
 
 package()
 {
-  install -D -m755 ${srcdir}/usr/bin/food_gui.sh ${pkgdir}/usr/bin/food_gui
-  python2 setup.py install --root=${pkgdir}
-  install -D -m644 ${srcdir}/usr/share/applications/food_gui.desktop \
-                   ${pkgdir}/usr/share/applications/food_gui.desktop
-  install -D -m644 ${srcdir}/usr/share/icons/hicolor/32x32/apps/food_gui.png \
-                   ${pkgdir}/usr/share/icons/hicolor/32x32/apps/food_gui.png
-  install -D -m644 ${srcdir}/usr/share/pixmaps/food_gui.png ${pkgdir}/usr/share/pixmaps/food_gui.png
+  install -D -m755 "${srcdir}/usr/bin/food_gui.sh" "${pkgdir}/usr/bin/food_gui"
+  python2 setup.py install --root="${pkgdir}"
+  install -D -m644 "${srcdir}/usr/share/applications/food_gui.desktop" \
+                   "${pkgdir}/usr/share/applications/food_gui.desktop"
+  install -D -m644 "${srcdir}/usr/share/icons/hicolor/32x32/apps/food_gui.png" \
+                   "${pkgdir}/usr/share/icons/hicolor/32x32/apps/food_gui.png"
+  install -D -m644 "${srcdir}/usr/share/pixmaps/food_gui.png" "${pkgdir}/usr/share/pixmaps/food_gui.png"
   
-  install -D -m644 ${srcdir}/usr/share/food_gui/db_eng.dat ${pkgdir}/usr/share/food_gui/db_eng.dat
-  install -D -m644 ${srcdir}/usr/share/food_gui/db_rus.dat ${pkgdir}/usr/share/food_gui/db_rus.dat
+  install -D -m644 "${srcdir}/usr/share/food_gui/db_eng.dat" "${pkgdir}/usr/share/food_gui/db_eng.dat"
+  install -D -m644 "${srcdir}/usr/share/food_gui/db_rus.dat" "${pkgdir}/usr/share/food_gui/db_rus.dat"
   
-  install -D -m644 ${srcdir}/usr/share/man/man1/food_gui.1 ${pkgdir}/usr/share/man/man1/food_gui.1
+  install -D -m644 "${srcdir}/usr/share/man/man1/food_gui.1" "${pkgdir}/usr/share/man/man1/food_gui.1"
 }
diff --git a/ghemical-mpqc/PKGBUILD b/ghemical-mpqc/PKGBUILD
index 26c7742..870d0f0 100644
--- a/ghemical-mpqc/PKGBUILD
+++ b/ghemical-mpqc/PKGBUILD
@@ -21,7 +21,7 @@ md5sums=('becf98626f0eba73f7f042bc92aa60ac'
 
 prepare()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd "${srcdir}/${_pkgname}-${pkgver}"
 
   # Some users have reported crashes due to the courier font.
   sed -i 's:courier 12:monospace:g' ./src/*.cpp
@@ -29,14 +29,14 @@ prepare()
 
 build()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix="/usr"
   make
 }
 
 package()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 }
diff --git a/git-etc/PKGBUILD b/git-etc/PKGBUILD
index a687fad..a177d15 100644
--- a/git-etc/PKGBUILD
+++ b/git-etc/PKGBUILD
@@ -19,23 +19,23 @@ backup=('etc/conf.d/git-etc.conf')
 package()
 {
   # daemon and gui
-  install -D -m755 ${srcdir}/usr/bin/git-etc ${pkgdir}/usr/bin/git-etc
-  install -D -m755 ${srcdir}/usr/bin/ctrlconf ${pkgdir}/usr/bin/ctrlconf
-  python2 setup.py install --root=${pkgdir}
-  install -D -m644 ${srcdir}/usr/share/applications/ctrlconf.desktop \
-                   ${pkgdir}/usr/share/applications/ctrlconf.desktop
+  install -D -m755 "${srcdir}/usr/bin/git-etc" "${pkgdir}/usr/bin/git-etc"
+  install -D -m755 "${srcdir}/usr/bin/ctrlconf" "${pkgdir}/usr/bin/ctrlconf"
+  python2 setup.py install --root="${pkgdir}"
+  install -D -m644 "${srcdir}/usr/share/applications/ctrlconf.desktop" \
+                   "${pkgdir}/usr/share/applications/ctrlconf.desktop"
   
   # service
-  install -D -m644 ${srcdir}/usr/lib/systemd/system/git-etc.service \
-                   ${pkgdir}/usr/lib/systemd/system/git-etc.service
-  install -D -m644 ${srcdir}/etc/conf.d/git-etc.conf \
-                   ${pkgdir}/etc/conf.d/git-etc.conf
+  install -D -m644 "${srcdir}/usr/lib/systemd/system/git-etc.service" \
+                   "${pkgdir}/usr/lib/systemd/system/git-etc.service"
+  install -D -m644 "${srcdir}/etc/conf.d/git-etc.conf" \
+                   "${pkgdir}/etc/conf.d/git-etc.conf"
   
   # man pages
-  install -D -m644 ${srcdir}/usr/share/man/man1/git-etc.1 \
-                   ${pkgdir}/usr/share/man/man1/git-etc.1
-  install -D -m644 ${srcdir}/usr/share/man/man1/ctrlconf.1 \
-                   ${pkgdir}/usr/share/man/man1/ctrlconf.1
-  install -D -m644 ${srcdir}/usr/share/man/man5/git-etc.conf.5 \
-                   ${pkgdir}/usr/share/man/man5/git-etc.conf.5
+  install -D -m644 "${srcdir}/usr/share/man/man1/git-etc.1" \
+                   "${pkgdir}/usr/share/man/man1/git-etc.1"
+  install -D -m644 "${srcdir}/usr/share/man/man1/ctrlconf.1" \
+                   "${pkgdir}/usr/share/man/man1/ctrlconf.1"
+  install -D -m644 "${srcdir}/usr/share/man/man5/git-etc.conf.5" \
+                   "${pkgdir}/usr/share/man/man5/git-etc.conf.5"
 }
diff --git a/gromacs4/PKGBUILD b/gromacs4/PKGBUILD
index 7e45891..09b89d2 100644
--- a/gromacs4/PKGBUILD
+++ b/gromacs4/PKGBUILD
@@ -19,30 +19,30 @@ source=(ftp://ftp.gromacs.org/pub/gromacs/${_pkgname}-${pkgver}.tar.gz)
 md5sums=('6a87e7cdfb25d81afa9fea073eb28468')
 
 build() {
-  mkdir -p ${srcdir}/double
+  mkdir -p "${srcdir}/double"
   msg2 "Building the doulbe precision files"
-  cd ${srcdir}/double	
+  cd "${srcdir}/double"
   cmake -DCMAKE_PREFIX=/opt/gromacs_old/ -DCMAKE_INSTALL_PREFIX=/opt/gromacs_old/ -DGMX_THREADS=ON -DGMX_SHARED_LIBS=ON -DGMX_DOUBLE=ON -DGMX_X11=ON -DGMX_DEFAULT_SUFFIX=OFF -DGMX_LIBS_SUFFIX=_4.5 -DGMX_BINARY_SUFFIX=_4.5 ../${_pkgname}-${pkgver}/
   make -j5
 }
 
 package() {
-  mkdir -p ${pkgdir}/etc/profile.d/
-  mkdir -p ${pkgdir}/usr/share/bash-completion/completions
+  mkdir -p "${pkgdir}/etc/profile.d/"
+  mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
   # Cleaning up, kept the csh completion at default location
   msg2 "Making the double precision executables"
-  cd ${srcdir}/double
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/double"
+  make DESTDIR="${pkgdir}" install
 
   # installing completions in correct location and environment setup script
-  install -D -m755 ${srcdir}/${_pkgname}-${pkgver}/scripts/completion.bash "${pkgdir}/usr/share/bash-completion/completions/gromacs_old"
-  mv ${pkgdir}/opt/gromacs_old/bin/GMXRC.bash ${pkgdir}/etc/profile.d/GMXRC_OLD.bash
-  mv ${pkgdir}/opt/gromacs_old/bin/GMXRC.zsh ${pkgdir}/etc/profile.d/GMXRC_OLD.zsh
-  mv ${pkgdir}/opt/gromacs_old/bin/GMXRC.csh ${pkgdir}/etc/profile.d/GMXRC_OLD.csh
-  sed "s:/opt/gromacs_old/bin:/etc/profile.d:g" ${pkgdir}/opt/gromacs_old/bin/GMXRC > ${pkgdir}/etc/profile.d/GMXRC
-  sed -e 's/GMXRC/GMXRC_OLD/g' ${pkgdir}/etc/profile.d/GMXRC > ${pkgdir}/etc/profile.d/GMXRC_OLD
-  chmod 755 ${pkgdir}/etc/profile.d/GMXRC_OLD
-  rm -f ${pkgdir}/etc/profile.d/GMXRC
-  rm -f ${pkgdir}/opt/gromacs_old/bin/completion.*
-  rm -f ${pkgdir}/opt/gromacs_old/bin/GMXRC
+  install -D -m755 "${srcdir}/${_pkgname}-${pkgver}/scripts/completion.bash" "${pkgdir}/usr/share/bash-completion/completions/gromacs_old"
+  mv "${pkgdir}/opt/gromacs_old/bin/GMXRC.bash" "${pkgdir}/etc/profile.d/GMXRC_OLD.bash"
+  mv "${pkgdir}/opt/gromacs_old/bin/GMXRC.zsh" "${pkgdir}/etc/profile.d/GMXRC_OLD.zsh"
+  mv "${pkgdir}/opt/gromacs_old/bin/GMXRC.csh" "${pkgdir}/etc/profile.d/GMXRC_OLD.csh"
+  sed "s:/opt/gromacs_old/bin:/etc/profile.d:g" "${pkgdir}/opt/gromacs_old/bin/GMXRC" > "${pkgdir}/etc/profile.d/GMXRC"
+  sed -e "s/GMXRC/GMXRC_OLD/g" "${pkgdir}/etc/profile.d/GMXRC" > "${pkgdir}/etc/profile.d/GMXRC_OLD"
+  chmod 755 "${pkgdir}/etc/profile.d/GMXRC_OLD"
+  rm -f "${pkgdir}/etc/profile.d/GMXRC"
+  rm -f "${pkgdir}/opt/gromacs_old/bin/completion.*"
+  rm -f "${pkgdir}/opt/gromacs_old/bin/GMXRC"
 } 
diff --git a/gromacs_mtdec/PKGBUILD b/gromacs_mtdec/PKGBUILD
index 70e9f8e..9866e88 100644
--- a/gromacs_mtdec/PKGBUILD
+++ b/gromacs_mtdec/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gromacs_mtdec
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GROMACS with additional implementation of metadynamics in essential coordinates"
 arch=('i686' 'x86_64')
 url="http://web.vscht.cz/spiwokv/index.html"
@@ -14,13 +14,27 @@ md5sums=('545bd6d903d8e8e94bd069c6368b6f25')
 
 build()
 {
-  cd ${srcdir}/mtdec
-  ./configure --prefix=/usr --program-suffix=_mtd
+  cd "${srcdir}/mtdec"
+  ./configure --prefix="/usr" --program-suffix=_mtd
   make
 }
 
 package()
 {
-  cd ${srcdir}/mtdec
-  make DESTDIR=${pkgdir} install
+  mkdir -p "${pkgdir}/etc/profile.d/"
+  mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
+  cd "${srcdir}/mtdec"
+  make DESTDIR="${pkgdir}" install
+  
+  # installing completions in correct location and environment setup script
+  install -D -m755 "${srcdir}/mtdec/scripts/completion.bash" "${pkgdir}/usr/share/bash-completion/completions/gromacs_mtdec"
+  mv "${pkgdir}/usr/bin/GMXRC.bash" "${pkgdir}/etc/profile.d/GMXRC_MTDEC.bash"
+  mv "${pkgdir}/usr/bin/GMXRC.zsh" "${pkgdir}/etc/profile.d/GMXRC_MTDEC.zsh"
+  mv "${pkgdir}/usr/bin/GMXRC.csh" "${pkgdir}/etc/profile.d/GMXRC_MTDEC.csh"
+  sed "s:/usr/bin:/etc/profile.d:g" "${pkgdir}/usr/bin/GMXRC" > "${pkgdir}/etc/profile.d/GMXRC"
+  sed -e "s/GMXRC/GMXRC_MTDEC/g" "${pkgdir}/etc/profile.d/GMXRC" > "${pkgdir}/etc/profile.d/GMXRC_MTDEC"
+  chmod 755 "${pkgdir}/etc/profile.d/GMXRC_MTDEC"
+  rm -f "${pkgdir}/etc/profile.d/GMXRC"
+  rm -f "${pkgdir}/usr/bin/completion.*"
+  rm -f "${pkgdir}/usr/bin/GMXRC"
 }
diff --git a/kate-latex-plugin/PKGBUILD b/kate-latex-plugin/PKGBUILD
index 093d2b6..8738cac 100644
--- a/kate-latex-plugin/PKGBUILD
+++ b/kate-latex-plugin/PKGBUILD
@@ -16,10 +16,10 @@ md5sums=('d6e30aa41da5279300f5d638ff595a77')
 
 build()
 {
-  if [ -d ${srcdir}/build ]; then
-    rm -rf ${srcdir}/build
+  if [[ -d ${srcdir}/build ]]; then
+    rm -rf "${srcdir}/build"
   fi
-  mkdir ${srcdir}/build && cd ${srcdir}/build
+  mkdir "${srcdir}/build"; cd "${srcdir}/build"
 
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
@@ -29,6 +29,6 @@ build()
 
 package()
 {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/kdeplasma-applets-oblikuestrategies/PKGBUILD b/kdeplasma-applets-oblikuestrategies/PKGBUILD
index 4b9b387..36038a8 100644
--- a/kdeplasma-applets-oblikuestrategies/PKGBUILD
+++ b/kdeplasma-applets-oblikuestrategies/PKGBUILD
@@ -17,18 +17,18 @@ md5sums=('e813b03a17d96cddc41acdf457e37bbb')
 
 build ()
 {
-  if [ -d ${srcdir}/build ]; then
-    rm -r ${srcdir}/build
+  if [[ -d ${srcdir}/build ]]; then
+    rm -rf "${srcdir}/build"
   fi
-  mkdir ${srcdir}/build && cd ${srcdir}/build
+  mkdir "${srcdir}/build"; cd "${srcdir}/build"
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
-        ../${_pkgname}/
+        ../${_pkgname}
   make
 }
 
 package()
 {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/kdeplasma-applets-pytextmonitor/PKGBUILD b/kdeplasma-applets-pytextmonitor/PKGBUILD
index ddebce3..4f21d3e 100644
--- a/kdeplasma-applets-pytextmonitor/PKGBUILD
+++ b/kdeplasma-applets-pytextmonitor/PKGBUILD
@@ -25,10 +25,10 @@ md5sums=('de54ece6545d28888a60d33f09ce69a1'
 build ()
 {
   # build dataengine
-  if [ -d ${srcdir}/${_dtengine}/build ]; then
-    rm -r ${srcdir}/${_dtengine}/build
+  if [[ -d ${srcdir}/${_dtengine}/build ]]; then
+    rm -rf "${srcdir}/${_dtengine}/build"
   fi
-  mkdir ${srcdir}/${_dtengine}/build && cd ${srcdir}/${_dtengine}/build
+  mkdir "${srcdir}/${_dtengine}/build"; cd "${srcdir}/${_dtengine}/build"
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
         ../
@@ -38,17 +38,17 @@ build ()
 package()
 {
   # install dataengine
-  cd ${srcdir}/${_dtengine}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${_dtengine}/build"
+  make DESTDIR="${pkgdir}" install
 
   # install plasmoid
-  install -D -m644 ${srcdir}/metadata.desktop \
-                   ${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop
-  install -D -m644 ${srcdir}/metadata.desktop \
-                   ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop
-  mkdir -p ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/{code,ui}
-  install -m644 ${srcdir}/contents/code/* \
-                -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code
-  install -m644 ${srcdir}/contents/ui/* \
-                -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui
+  install -D -m644 "${srcdir}/metadata.desktop" \
+                   "${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop"
+  install -D -m644 "${srcdir}/metadata.desktop" \
+                   "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop"
+  mkdir -p "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/"{code,ui}
+  install -m644 "${srcdir}/contents/code/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code"
+  install -m644 "${srcdir}/contents/ui/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui"
 }
diff --git a/kdeplasma-applets-stdin-svn/PKGBUILD b/kdeplasma-applets-stdin-svn/PKGBUILD
index 27cfa31..a0b045f 100644
--- a/kdeplasma-applets-stdin-svn/PKGBUILD
+++ b/kdeplasma-applets-stdin-svn/PKGBUILD
@@ -18,17 +18,17 @@ md5sums=('SKIP')
 
 pkgver()
 {
-  cd ${srcdir}/${_pkgname}
+  cd "${srcdir}/${_pkgname}"
   local ver=`svnversion`
-  printf "%s" ${ver//[[:alpha:]]}
+  printf "%s" "${ver//[[:alpha:]]}"
 }
 
 build()
 {
-  if [ -d ${srcdir}/build ]; then
-    rm -rf ${srcdir}/build
+  if [[ -d ${srcdir}/build ]]; then
+    rm -rf "${srcdir}/build"
   fi
-  mkdir ${srcdir}/build && cd ${srcdir}/build
+  mkdir "${srcdir}/build"; cd "${srcdir}/build"
   cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
         -DCMAKE_BUILD_TYPE=Release \
         ../${_pkgname}
@@ -37,6 +37,6 @@ build()
 
 package()
 {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/kdeplasma-wallpapers-dayandnight/PKGBUILD b/kdeplasma-wallpapers-dayandnight/PKGBUILD
index 0457a38..8e02b3d 100644
--- a/kdeplasma-wallpapers-dayandnight/PKGBUILD
+++ b/kdeplasma-wallpapers-dayandnight/PKGBUILD
@@ -15,13 +15,13 @@ md5sums=('1be7e0bf85563029f1158e5685e4f256')
 
 package()
 {
-  install -D -m644 ${srcdir}/metadata.desktop \
-                   ${pkgdir}/`kde4-config --prefix`/share/kde4/services/plasma-wallpaper-${_pkgname}.desktop
-  install -D -m644 ${srcdir}/metadata.desktop \
-                   ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/metadata.desktop
-  mkdir -p ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/{code,ui}
-  install -m644 ${srcdir}/contents/code/* \
-                -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/code
-  install -m644 ${srcdir}/contents/ui/* \
-                -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/ui
+  install -D -m644 "${srcdir}/metadata.desktop" \
+                   "${pkgdir}/`kde4-config --prefix`/share/kde4/services/plasma-wallpaper-${_pkgname}.desktop"
+  install -D -m644 "${srcdir}/metadata.desktop" \
+                   "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/metadata.desktop"
+  mkdir -p "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/"{code,ui}
+  install -m644 "${srcdir}/contents/code/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/code"
+  install -m644 "${srcdir}/contents/ui/"* \
+                -t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/wallpapers/${_pkgname}/contents/ui"
 }
diff --git a/libghemical-mpqc/PKGBUILD b/libghemical-mpqc/PKGBUILD
index 01e1716..0a45346 100644
--- a/libghemical-mpqc/PKGBUILD
+++ b/libghemical-mpqc/PKGBUILD
@@ -19,13 +19,13 @@ md5sums=('1d5c9c19bb119470d2bb41a7e681eafd')
 
 build()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-openbabel --enable-mpqc --enable-mopac7
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-mpqc --enable-mopac7
   make
 }
 
 package()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD
index d588114..da2de23 100644
--- a/mathmech/PKGBUILD
+++ b/mathmech/PKGBUILD
@@ -21,16 +21,16 @@ _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr
 
 build ()
 {
-  if [ -d ${srcdir}/build ]; then
-    rm -rf ${srcdir}/build
+  if [[ -d ${srcdir}/build ]]; then
+    rm -rf "${srcdir}/build"
   fi
-  mkdir ${srcdir}/build && cd ${srcdir}/build
+  mkdir "${srcdir}/build"; cd "${srcdir}/build"
   cmake ${_cmakekeys} ../
   make
 }
 
 package()
 {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} instal
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mpqc-shared/PKGBUILD b/mpqc-shared/PKGBUILD
index 3e04674..cda6682 100644
--- a/mpqc-shared/PKGBUILD
+++ b/mpqc-shared/PKGBUILD
@@ -16,14 +16,14 @@ md5sums=('2f9b4f7487387730d78066a53764f848')
 
 build()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-shared
   make
 }
 
 package()
 {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  make installroot=${pkgdir} install
-  make installroot=${pkgdir} install_devel
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make installroot="${pkgdir}" install
+  make installroot="${pkgdir}" install_devel
 } 
diff --git a/oxygen-transparent-macos/PKGBUILD b/oxygen-transparent-macos/PKGBUILD
index cb0a42e..42c727d 100644
--- a/oxygen-transparent-macos/PKGBUILD
+++ b/oxygen-transparent-macos/PKGBUILD
@@ -18,12 +18,12 @@ md5sums=('SKIP'
          '543a9d78e4fca3eda262016a37040632')
 
 pkgver() {
-cd "${_pkgname}"
-echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd "${_pkgname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 prepare() {
-  cd ${srcdir}
+  cd "${srcdir}"
   patch -p0 < oxytrans-macos.patch
 }
 
diff --git a/qmmp-qsmmp-git/PKGBUILD b/qmmp-qsmmp-git/PKGBUILD
index 8d1a99b..15f4e5c 100644
--- a/qmmp-qsmmp-git/PKGBUILD
+++ b/qmmp-qsmmp-git/PKGBUILD
@@ -16,21 +16,21 @@ md5sums=('SKIP')
 
 pkgver()
 {
-  cd ${_gitname}
+  cd "${_gitname}"
   local ver=`git describe --long`
   # because default ver is "qmmp.*"
-  printf "%s" ${${ver//-/.}//qmmp./}
+  printf "%s" "${${ver//-/.}//qmmp./}"
 }
 
 build()
 {
-  cd ${srcdir}/${_gitname}
+  cd "${srcdir}/${_gitname}"
   qmake-qt4 PREFIX=/usr
   make
 }
 
 package()
 {
-  cd ${srcdir}/${_gitname}
-  make INSTALL_ROOT=${pkgdir} install
+  cd "${srcdir}/${_gitname}"
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/qscite/PKGBUILD b/qscite/PKGBUILD
index 89793ad..9ba16c8 100644
--- a/qscite/PKGBUILD
+++ b/qscite/PKGBUILD
@@ -18,24 +18,24 @@ md5sums=('2ce7a915e5560725d897816688a4bef7'
 
 prepare()
 {
-  cd ${srcdir}/${pkgname}
+  cd "${srcdir}/${pkgname}"
   # fix scintilla2 download path
-  patch -p0 < ${srcdir}/get_qsci.sh.patch
+  patch -p0 < "${srcdir}/get_qsci.sh.patch"
   # add install section and fix filepath
-  patch -p0 < ${srcdir}/qscite.pro.patch
+  patch -p0 < "${srcdir}/qscite.pro.patch"
   # fix version
-  sed -i "s#0.5-svn190#${pkgver}#" qscite.desktop
+  sed -i "s#0.5-svn190#${pkgver//_/-}#" qscite.desktop
 }
 
 build()
 {
-  cd ${srcdir}/${pkgname}
+  cd "${srcdir}/${pkgname}"
   qmake-qt4 PREFIX=/usr -Wnone qscite-release.pro
   make
 }
 
 package()
 {
-  cd ${srcdir}/${pkgname}
-  make INSTALL_ROOT=${pkgdir} install
+  cd "${srcdir}/${pkgname}"
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/scidavis/PKGBUILD b/scidavis/PKGBUILD
index 33fc170..78d9c36 100644
--- a/scidavis/PKGBUILD
+++ b/scidavis/PKGBUILD
@@ -30,35 +30,35 @@ md5sums=('c5650475c5e0b22f9ee5dc49630a0e89'
 
 prepare()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
   # fix private to public
-  patch -p0 < ${srcdir}/multipeakfit.h.patch
+  patch -p0 < "${srcdir}/multipeakfit.h.patch"
   # disable building self library
-  patch < ${srcdir}/scidavis.pro.patch
+  patch < "${srcdir}/scidavis.pro.patch"
   # fix bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655776
-  patch -p0 < ${srcdir}/scidavis.sip.patch
+  patch -p0 < "${srcdir}/scidavis.sip.patch"
   # change python to python2
-  patch < ${srcdir}/scidavis-python2.patch
+  patch < "${srcdir}/scidavis-python2.patch"
   # fix path to QtAssistant header
-  patch -p0 < ${srcdir}/qt-assistant-compat.patch
+  patch -p0 < "${srcdir}/qt-assistant-compat.patch"
   # change qwt to qwt5
-  patch < ${srcdir}/qwt5.patch
+  patch < "${srcdir}/qwt5.patch"
 }
 
 build()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   qmake-qt4
   make
 }
 
 package ()
 {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL_ROOT=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
 
   _pydir=`python2 -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
-  python2 `dirname ${_pydir}`/py_compile.py ${pkgdir}/etc/scidavisrc.py
-  python2 `dirname ${_pydir}`/py_compile.py ${pkgdir}/usr/share/scidavis/scidavisUtil.py
+  python2 `dirname ${_pydir}`/py_compile.py "${pkgdir}/etc/scidavisrc.py"
+  python2 `dirname ${_pydir}`/py_compile.py "${pkgdir}/usr/share/scidavis/scidavisUtil.py"
 }