Add quote strings to bash variables

Contributed by graysky at https://aur.archlinux.org/packages/zfs-utils/
pull/16/head
Jesus Alvarez 11 years ago
parent be17456bc3
commit b27de85692
  1. 4
      spl-utils/PKGBUILD
  2. 6
      spl/PKGBUILD
  3. 20
      zfs-utils/PKGBUILD
  4. 4
      zfs/PKGBUILD

@ -24,7 +24,7 @@ build() {
package() {
cd "$srcdir/spl-0.6.2"
make DESTDIR=$pkgdir install
make DESTDIR="$pkgdir" install
install -D -m644 $srcdir/spl-utils.hostid $pkgdir/etc/hostid
install -D -m644 "$srcdir"/spl-utils.hostid "$pkgdir"/etc/hostid
}

@ -30,9 +30,9 @@ build() {
package() {
cd "$srcdir/spl-0.6.2"
make DESTDIR=$pkgdir install
make DESTDIR="$pkgdir" install
# move module tree /lib -> /usr/lib
cp -r $pkgdir/{lib,usr}
rm -r $pkgdir/lib
cp -r "$pkgdir"/{lib,usr}
rm -r "$pkgdir"/lib
}

@ -41,19 +41,19 @@ package() {
make DESTDIR="$pkgdir" install
# Remove uneeded files
rm -r $pkgdir/etc/init.d
rm -r $pkgdir/usr/lib/dracut
rm -r "$pkgdir"/etc/init.d
rm -r "$pkgdir"/usr/lib/dracut
# move module tree /lib -> /usr/lib
cp -r $pkgdir/{lib,usr}
rm -r $pkgdir/lib
cp -r "$pkgdir"/{lib,usr}
rm -r "$pkgdir"/lib
# Fixup path
mv $pkgdir/sbin/mount.zfs $pkgdir/usr/bin/
rm -r $pkgdir/sbin
mv "$pkgdir"/sbin/mount.zfs "$pkgdir"/usr/bin/
rm -r "$pkgdir"/sbin
install -D -m644 $srcdir/zfs-utils.initcpio.hook $pkgdir/usr/lib/initcpio/hooks/zfs
install -D -m644 $srcdir/zfs-utils.initcpio.install $pkgdir/usr/lib/initcpio/install/zfs
install -D -m644 $srcdir/zfs-utils.service $pkgdir/usr/lib/systemd/system/zfs.service
install -D -m644 $srcdir/zfs-utils.bash-completion $pkgdir/usr/share/bash-completion/completions/zfs
install -D -m644 "$srcdir"/zfs-utils.initcpio.hook "$pkgdir"/usr/lib/initcpio/hooks/zfs
install -D -m644 "$srcdir"/zfs-utils.initcpio.install "$pkgdir"/usr/lib/initcpio/install/zfs
install -D -m644 "$srcdir"/zfs-utils.service "$pkgdir"/usr/lib/systemd/system/zfs.service
install -D -m644 "$srcdir"/zfs-utils.bash-completion "$pkgdir"/usr/share/bash-completion/completions/zfs
}

@ -35,6 +35,6 @@ package() {
make DESTDIR="$pkgdir" install
# move module tree /lib -> /usr/lib
cp -r $pkgdir/{lib,usr}
rm -r $pkgdir/lib
cp -r "$pkgdir"/{lib,usr}
rm -r "$pkgdir"/lib
}

Loading…
Cancel
Save