From 87be1dffeb7e6fae66f79cfe8e570fbcc0b85185 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 29 Apr 2019 00:00:14 -0500
Subject: travis: Fixes

---
 .travis/install | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 .travis/install

(limited to '.travis/install')

diff --git a/.travis/install b/.travis/install
old mode 100644
new mode 100755
index 87996af..d0b606f
--- a/.travis/install
+++ b/.travis/install
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/bin/sh -e
 
 . $(dirname $0)/config
 
-curl -O https://mirrormaster.adelielinux.org/adelie/apk-tools-static/x86_64.apk
+curl -O https://distfiles.adelielinux.org/adelie/apk-tools-static/x86_64.apk
 tar -xzOf x86_64.apk sbin/apk.static > /tmp/apk.static
 
 mkdir -p "$NEWROOT"/etc/apk
 /tmp/apk.static -X "https://mirrormaster.adelielinux.org/adelie/current/system" --root "$NEWROOT" --initdb --no-progress add adelie-core bash-binsh musl-dev gcc binutils
 
-pushd "$NEWROOT"
+cd "$NEWROOT"
 
 mount -t proc none proc
 mount -t sysfs none sys
@@ -17,6 +17,4 @@ mount -R /run run
 ln -s /run/shm dev/shm
 mkdir ./$CLONE_DIR
 mount -B $CLONE_DIR ./$CLONE_DIR
-useradd -m -c "Travis User" -s /bin/sh -G wheel -u $SUDO_UID $SUDO_USER
-
-popd
+chroot "$NEWROOT" useradd -m -c "Travis User" -s /bin/sh -G wheel -u $SUDO_UID $SUDO_USER
-- 
cgit v1.2.3-70-g09d2