Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
| ... | ... |
@@ -4,19 +4,19 @@ |
| 4 | 4 |
# requires root |
| 5 | 5 |
set -e |
| 6 | 6 |
|
| 7 |
-PACSTRAP=$(which pacstrap) |
|
| 7 |
+PACSTRAP=$(hash pacstrap &>/dev/null) |
|
| 8 | 8 |
[ "$PACSTRAP" ] || {
|
| 9 | 9 |
echo "Could not find pacstrap. Run pacman -S arch-install-scripts" |
| 10 | 10 |
exit 1 |
| 11 | 11 |
} |
| 12 |
-EXPECT=$(which expect) |
|
| 13 |
-[ "$EXPECT" ] || {
|
|
| 12 |
+ |
|
| 13 |
+EXPECT=$(hash expect &>/dev/null) |
|
| 14 |
+[[ "$EXPECT" ]] || {
|
|
| 14 | 15 |
echo "Could not find expect. Run pacman -S expect" |
| 15 | 16 |
exit 1 |
| 16 | 17 |
} |
| 17 | 18 |
|
| 18 |
-ROOTFS=~/rootfs-arch-$$-$RANDOM |
|
| 19 |
-mkdir $ROOTFS |
|
| 19 |
+ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX) |
|
| 20 | 20 |
|
| 21 | 21 |
#packages to ignore for space savings |
| 22 | 22 |
PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs |