Commit 45693a02 authored by Dan Johansen's avatar Dan Johansen

fix dependency checks.... I think...

parent 2ac3554d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Set globals # Set globals
TMPDIR=/var/tmp/manjaro-arm-installer TMPDIR=/var/tmp/manjaro-arm-installer
PROFILES=/var/tmp/manjaro-arm-installer/profiles #PROFILES=/var/tmp/manjaro-arm-installer/profiles
ARCH='aarch64' ARCH='aarch64'
# clearing variables # clearing variables
...@@ -16,28 +16,28 @@ SDCARD="" ...@@ -16,28 +16,28 @@ SDCARD=""
#LOCALE="" #LOCALE=""
# Sanity checks for dependencies # Sanity checks for dependencies
#if [ ! -f /usr/bin/sudo ] if [ ! -f /usr/bin/sudo ]; then
# echo "sudo command is missing! Please install sudo!" echo "sudo command is missing! Please install sudo!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/git ] elif [ ! -f /usr/bin/git ]; then
# echo "git command is missing! Please install git!" echo "git command is missing! Please install git!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/parted ] elif [ ! -f /usr/bin/parted ]; then
# echo "parted command is missing! Please install parted!" echo "parted command is missing! Please install parted!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/systemd-nspawn ] elif [ ! -f /usr/bin/systemd-nspawn ]; then
# echo "systemd-nspawn command is missing! Please install systemd!" echo "systemd-nspawn command is missing! Please install systemd!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/wget ] elif [ ! -f /usr/bin/wget ]; then
# echo "wget command is missing! Please install wget!" echo "wget command is missing! Please install wget!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/dialog ] elif [ ! -f /usr/bin/dialog ]; then
# echo "dialog command is missing! Please install dialog!" echo "dialog command is missing! Please install dialog!"
# exit 1 exit 1
# elif [ ! -f /usr/bin/bsdtar ] elif [ ! -f /usr/bin/bsdtar ]; then
# echo "bsdtar command is missing! Please install libarchive!" echo "bsdtar command is missing! Please install libarchive!"
# exit 1 exit 1
#fi fi
# Functions # Functions
...@@ -72,14 +72,14 @@ show_elapsed_time(){ ...@@ -72,14 +72,14 @@ show_elapsed_time(){
} }
getarmprofiles () { getarmprofiles () {
if ls $PROFILES/arm-profiles/* 1> /dev/null 2>&1; then if ls $TMPDIR/arm-profiles/* 1> /dev/null 2>&1; then
cd $PROFILES/arm-profiles cd $TMPDIR/arm-profiles
git pull git pull 1> /dev/null 2>&1
else else
sudo mkdir -p $PROFILES sudo mkdir -p $TMPDIR
sudo chmod 777 $PROFILES sudo chmod 777 $TMPDIR
cd $PROFILES cd $TMPDIR
git clone https://gitlab.com/Strit/arm-profiles.git git clone https://gitlab.com/Strit/arm-profiles.git 1> /dev/null 2>&1
fi fi
} }
...@@ -107,7 +107,7 @@ create_install() { ...@@ -107,7 +107,7 @@ create_install() {
msg "Installing packages for $EDITION on $DEVICE..." msg "Installing packages for $EDITION on $DEVICE..."
# Install device and editions specific packages # Install device and editions specific packages
sudo systemd-nspawn -D $TMPDIR/root pacman -Syy base $PKG_DEVICE $PKG_EDITION lsb-release --needed --noconfirm sudo systemd-nspawn -D $TMPDIR/root pacman -Syy base $PKG_DEVICE $PKG_EDITION --needed --noconfirm
msg "Enabling services..." msg "Enabling services..."
# Enable services # Enable services
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment