Browse Source

mkimage-arch: use mktemp to create ROOTFS directory

Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Bartłomiej Piotrowski 11 năm trước cách đây
mục cha
commit
c138c335a5
1 tập tin đã thay đổi với 5 bổ sung5 xóa
  1. 5 5
      contrib/mkimage-arch.sh

+ 5 - 5
contrib/mkimage-arch.sh

@@ -4,19 +4,19 @@
 # requires root
 # requires root
 set -e
 set -e
 
 
-PACSTRAP=$(which pacstrap)
+PACSTRAP=$(hash pacstrap &>/dev/null)
 [ "$PACSTRAP" ] || {
 [ "$PACSTRAP" ] || {
     echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
     echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
     exit 1
     exit 1
 }
 }
-EXPECT=$(which expect)
-[ "$EXPECT" ] || {
+
+EXPECT=$(hash expect &>/dev/null)
+[[ "$EXPECT" ]] || {
     echo "Could not find expect. Run pacman -S expect"
     echo "Could not find expect. Run pacman -S expect"
     exit 1
     exit 1
 }
 }
 
 
-ROOTFS=~/rootfs-arch-$$-$RANDOM
-mkdir $ROOTFS
+ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX)
 
 
 #packages to ignore for space savings
 #packages to ignore for space savings
 PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs
 PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs