Add quotes and braces arround shell variables

Use the same scheme anywhere in the script.

2 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c08b4c6e1262..e0d6c39f2612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = termite
+pkgbase = termite-nocsd
 	pkgdesc = A simple VTE-based terminal without GTK client side decorations. Perfect for wayland+sway users.
 	pkgver = 13
 	pkgrel = 2
@@ -14,7 +14,9 @@ pkgbase = termite
 	depends = pcre2
 	depends = gnutls
 	depends = vte-common
-	source = git+https://github.com/thestinger/termite#tag=v13
+	provides = termite
+	conflicts = termite
+	source = termite-nocsd::git+https://github.com/thestinger/termite#tag=v13
 	source = git+https://github.com/thestinger/vte-ng#tag=0.50.2.a
 	source = termite-util::git+https://github.com/thestinger/util
 	source = termite.patch
diff --git a/PKGBUILD b/PKGBUILD
index 125bf087f399..7507e8104684 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: blimpy <0087yugbocaj@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 
-pkgbase=termite
+pkgbase=termite-nocsd
 pkgname=('termite-nocsd')
 pkgver=13
 pkgrel=2
@@ -16,8 +16,8 @@ arch=('x86_64')
 depends=('gtk3' 'pcre2' 'gnutls' 'vte-common')
 makedepends=('git' 'ncurses' 'intltool' 'gperf' 'gtk-doc')
 _vtever=0.50.2.a
-source=("git+https://github.com/thestinger/termite#tag=v$pkgver"
-        "git+https://github.com/thestinger/vte-ng#tag=$_vtever"
+source=("${pkgbase}::git+https://github.com/thestinger/termite#tag=v${pkgver}"
+        "git+https://github.com/thestinger/vte-ng#tag=${_vtever}"
         "termite-util::git+https://github.com/thestinger/util"
         "termite.patch")
 sha256sums=('SKIP'
@@ -26,24 +26,24 @@ sha256sums=('SKIP'
             '4319296a88502b0a0397704177047cf7b0d39816b87d0f477a92ced4d1f16715')
 
 prepare() {
-  cd $pkgbase
-  patch -Np1 -i "${srcdir}/termite.patch" "${srcdir}/termite/termite.cc" 
+  cd "${pkgbase}"
+  patch -Np1 -i "${srcdir}/termite.patch" "${srcdir}/termite/termite.cc"
 
   cd ../vte-ng
   echo 'sources: $(BUILT_SOURCES)' >> src/Makefile.am 
   NOCONFIGURE=1 ./autogen.sh
 
-  cd ../$pkgbase
+  cd "../${pkgbase}"
   git submodule init
-  git config --local submodule.util.url "$srcdir/termite-util"
+  git config --local submodule.util.url "${srcdir}/termite-util"
   git submodule update
 }
 
 build() {
   cd vte-ng
   ./configure \
-    --prefix="$srcdir/vte-static" \
-    --localedir="/usr/share/$pkgbase/locale" \
+    --prefix="${srcdir}/vte-static" \
+    --localedir="/usr/share/${pkgbase}/locale" \
     --enable-static \
     --disable-shared \
     enable_introspection=no \
@@ -53,8 +53,8 @@ build() {
   make -C src sources install-exec install-data
   make install-pkgconfigDATA
 
-  cd ../$pkgbase
-  export PKG_CONFIG_PATH="$srcdir/vte-static/lib/pkgconfig"
+  cd "../${pkgbase}"
+  export PKG_CONFIG_PATH="${srcdir}/vte-static/lib/pkgconfig"
   make
 }
 
@@ -62,8 +62,7 @@ package_termite-nocsd() {
   depends+=('termite-terminfo')
   backup=(etc/xdg/termite/config)
 
-  make -C vte-ng/po DESTDIR="$pkgdir" install-data
-  make -C $pkgbase DESTDIR="$pkgdir" PREFIX=/usr install
-  rm -r "$pkgdir/usr/share/terminfo"
+  make -C vte-ng/po DESTDIR="${pkgdir}" install-data
+  make -C "${pkgbase}" DESTDIR="${pkgdir}" PREFIX=/usr install
+  rm -r "${pkgdir}/usr/share/terminfo"
 }
-