commit 7c628920dc786f3c855398e33cd3e8fad2a6ecf0
parent e263c23651725a9d7d404c2b8cb8f6ef60dc332e
Author: sin <sin@2f30.org>
Date: Thu, 20 Feb 2014 16:10:47 +0000
Quote variables in package scripts
Diffstat:
25 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/pkgs/busybox b/pkgs/busybox
@@ -8,9 +8,9 @@ install() {
# Install package
cd src/
chmod +x busybox
- cp busybox $root/bin
+ cp busybox "$root/bin"
cd -
- cd $root/bin
+ cd "$root/bin"
ln -sf busybox addgroup
ln -sf busybox adduser
ln -sf busybox awk
diff --git a/pkgs/crossmusl b/pkgs/crossmusl
@@ -5,9 +5,9 @@ fetch() {
}
install() {
- tar xJf src/crossx86-x86_64-linux-musl-0.9.15.tar.xz -C $root/opt/cross
- mv $root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib64/* $root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib
- cd $root/bin
+ tar xJf src/crossx86-x86_64-linux-musl-0.9.15.tar.xz -C "$root/opt/cross"
+ mv "$root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib64/*" "$root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib"
+ cd "$root/bin"
targets="ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip"
for t in $targets; do
ln -sf ../opt/cross/x86_64-linux-musl/bin/x86_64-linux-musl-$t $t
diff --git a/pkgs/dwm b/pkgs/dwm
@@ -22,7 +22,7 @@ build() {
install() {
cd src/dwm
- cp dwm $root/bin
- cp dwm.1 $root/share/man/man1
+ cp dwm "$root/bin"
+ cp dwm.1 "$root/share/man/man1"
cd -
}
diff --git a/pkgs/emul b/pkgs/emul
@@ -12,7 +12,7 @@ unpack() {
install() {
cd src
- cp -arP root.x86_64/* $root/emul
+ cp -arP root.x86_64/* "$root/emul"
cd -
- cp stuff/enter-emul $root/bin
+ cp stuff/enter-emul "$root/bin"
}
diff --git a/pkgs/fs b/pkgs/fs
@@ -6,6 +6,6 @@ fetch() {
install() {
cd src/fs
- cp -r * $root/
+ cp -r * "$root/"
cd -
}
diff --git a/pkgs/kernel b/pkgs/kernel
@@ -21,8 +21,8 @@ build() {
install() {
cd src/linux-$version
- cp arch/x86/boot/bzImage $root/boot
- cp .config $root/boot/bzImage.config
- cp System.map $root/boot
+ cp arch/x86/boot/bzImage "$root/boot"
+ cp .config "$root/boot/bzImage.config"
+ cp System.map "$root/boot"
cd -
}
diff --git a/pkgs/libevent b/pkgs/libevent
@@ -12,7 +12,7 @@ unpack() {
build() {
cd src/libevent-2.0.21-stable
- CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$libcroot --disable-shared --enable-static || return 1
+ CC="x86_64-linux-musl-gcc -static" ./configure --prefix="$libcroot" --disable-shared --enable-static || return 1
make -j$nprocs || return 1
cd -
}
diff --git a/pkgs/make b/pkgs/make
@@ -12,7 +12,7 @@ unpack() {
build() {
cd src/make-3.82
- CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$root --disable-nls || return 1
+ CC="x86_64-linux-musl-gcc -static" ./configure --prefix="$root" --disable-nls || return 1
make -j$nprocs || return 1
cd -
}
diff --git a/pkgs/man b/pkgs/man
@@ -18,6 +18,6 @@ build() {
install() {
cd src/man
- cp man $root/bin
+ cp man "$root/bin"
cd -
}
diff --git a/pkgs/mksh b/pkgs/mksh
@@ -17,8 +17,8 @@ build() {
}
install() {
- cp src/mksh/mksh $root/bin
- cd $root/bin
+ cp src/mksh/mksh "$root/bin"
+ cd "$root/bin"
ln -sf /bin/mksh sh
cd -
}
diff --git a/pkgs/ncurses b/pkgs/ncurses
@@ -13,7 +13,7 @@ unpack() {
build() {
cd src/ncurses-5.9
cp $top/stuff/ncurses-fallback.c ncurses/fallback.c
- CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$libcroot --without-tests \
+ CC="x86_64-linux-musl-gcc -static" ./configure --prefix="$libcroot" --without-tests \
--with-normal --enable-sigwinch --disable-nls --without-dlsym \
--without-cxx-binding \
--with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx || return 1
diff --git a/pkgs/rsync b/pkgs/rsync
@@ -12,7 +12,7 @@ unpack() {
build() {
cd src/rsync-3.0.9
- CC=x86_64-linux-musl-gcc ./configure --prefix=$root LDFLAGS="-static" || return 1
+ CC=x86_64-linux-musl-gcc ./configure --prefix="$root" LDFLAGS="-static" || return 1
make -j$nprocs || return 1
cd -
}
diff --git a/pkgs/sbase b/pkgs/sbase
@@ -13,6 +13,6 @@ build() {
install() {
cd src/sbase
- make PREFIX=$root install
+ make PREFIX="$root" install
cd -
}
diff --git a/pkgs/sdhcp b/pkgs/sdhcp
@@ -18,5 +18,5 @@ build() {
}
install() {
- cp src/sdhcp/sdhcp $root/bin || return 1
+ cp src/sdhcp/sdhcp "$root/bin" || return 1
}
diff --git a/pkgs/sic b/pkgs/sic
@@ -18,5 +18,5 @@ build() {
}
install() {
- cp src/sic/sic $root/bin
+ cp src/sic/sic "$root/bin"
}
diff --git a/pkgs/sinit b/pkgs/sinit
@@ -13,9 +13,9 @@ build() {
install() {
cd src/sinit
- make PREFIX=$root install
+ make PREFIX="$root" install
cd -
- cd $root
+ cd "$root"
ln -sf /bin/sinit init
cd -
}
diff --git a/pkgs/smdev b/pkgs/smdev
@@ -13,6 +13,6 @@ build() {
install() {
cd src/smdev
- make PREFIX=$root install || return 1
+ make PREFIX="$root" install || return 1
cd -
}
diff --git a/pkgs/terminus b/pkgs/terminus
@@ -12,8 +12,8 @@ unpack() {
build() {
cd src/terminus-font-4.38
- sh configure --psfdir=$root/share/fonts/console \
- --x11dir=$root/share/fonts/misc || return 1
+ sh configure --psfdir="$root/share/fonts/console" \
+ --x11dir="$root/share/fonts/misc" || return 1
make || return 1
cd -
}
@@ -22,12 +22,12 @@ install() {
cd src/terminus-font-4.38
make DESTDIR=/ install || return 1
cd -
- cd $root/share/fonts/misc
+ cd "$root/share/fonts/misc"
gzip -d *.gz
mkfontscale
mkfontdir
cd -
- cd $root/share/fonts/console
+ cd "$root/share/fonts/console"
gzip -d *.gz
cd -
}
diff --git a/pkgs/tinywm b/pkgs/tinywm
@@ -1,11 +1,11 @@
build() {
cd stuff
- x86_64-musl-linux-gcc -I$libcroot/include -L$libcroot/lib tinywm.c -o tinywm -lX11 -static || return 1
+ x86_64-musl-linux-gcc -I"$libcroot/include" -L"$libcroot/lib" tinywm.c -o tinywm -lX11 -static || return 1
cd -
}
install() {
cd stuff
- cp tinywm $root/bin
+ cp tinywm "$root/bin"
cd -
}
diff --git a/pkgs/tinyxserver b/pkgs/tinyxserver
@@ -23,7 +23,7 @@ install() {
cd src/tinyxserver
make DESTDIR="$root" BINDIR="/bin" install || return 1
cd -
- cd $root/usr/share/fonts/misc
+ cd "$root/usr/share/fonts/misc"
mkfontscale
mkfontdir
cd -
diff --git a/pkgs/tmux b/pkgs/tmux
@@ -12,7 +12,7 @@ unpack() {
build() {
cd src/tmux-1.8
- CC=x86_64-linux-musl-gcc ./configure --prefix=$root LDFLAGS=-static \
+ CC=x86_64-linux-musl-gcc ./configure --prefix="$root" LDFLAGS=-static \
CFLAGS="-I$libcroot/include/ncurses" || return 1
make -j$nprocs || return 1
cd -
diff --git a/pkgs/ubase b/pkgs/ubase
@@ -7,13 +7,13 @@ fetch() {
build() {
cd src/ubase
make clean
- make -j$nprocs CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
+ make -j$nprocs CC=x86_64-linux-musl-gcc LDFLAGS=-static
cd -
}
install() {
cd src/ubase
- make PREFIX=$root install
+ make PREFIX="$root" install
chmod 4755 "$root/bin/su"
cd -
}
diff --git a/pkgs/uuterm b/pkgs/uuterm
@@ -17,5 +17,5 @@ build() {
}
install() {
- cp src/uuterm/uuterm-x11 $root/bin
+ cp src/uuterm/uuterm-x11 "$root/bin"
}
diff --git a/pkgs/xsetroot b/pkgs/xsetroot
@@ -1,11 +1,11 @@
build() {
cd stuff
- x86_64-musl-linux-gcc -I$libcroot/include -L$libcroot/lib xsetroot.c -o xsetroot -lX11 -static || return 1
+ x86_64-musl-linux-gcc -I"$libcroot/include" -L"$libcroot/lib" xsetroot.c -o xsetroot -lX11 -static || return 1
cd -
}
install() {
cd stuff
- cp xsetroot $root/bin
+ cp xsetroot "$root/bin"
cd -
}
diff --git a/pkgs/zlib b/pkgs/zlib
@@ -12,7 +12,7 @@ unpack() {
build() {
cd src/zlib-1.2.8
- CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --static || return 1
+ CC=x86_64-linux-musl-gcc ./configure --prefix="$libcroot" --static || return 1
make -j$nprocs || return 1
cd -
}
