Merge pull request #75 from tijmenvandenbrink/master

[EVA-2020-02-2.git] / install.sh

diff --git a/install.sh b/install.sh
index b7ed9cca7e68a6ac0bb943c10634376069316259..6837697f3a3823c4e3f71b63be2222df2b9484d7 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CONFIG=/boot/config.txt
 #!/bin/bash
 
 CONFIG=/boot/config.txt

-DATESTAMP=`date "+%Y-%M-%d-%H-%M-%S"`
+DATESTAMP=`date "+%Y-%m-%d-%H-%M-%S"`

 CONFIG_BACKUP=false
 APT_HAS_UPDATED=false
 USER_HOME=/home/$SUDO_USER
 CONFIG_BACKUP=false
 APT_HAS_UPDATED=false
 USER_HOME=/home/$SUDO_USER


@@ -126,6 +126,8 @@ eval $CONFIG_VARS
 RESOURCES_DIR=$RESOURCES_TOP_DIR/$LIBRARY_NAME
 UNINSTALLER=$RESOURCES_DIR/uninstall.sh
 
 RESOURCES_DIR=$RESOURCES_TOP_DIR/$LIBRARY_NAME
 UNINSTALLER=$RESOURCES_DIR/uninstall.sh
 

+mkdir -p $RESOURCES_DIR
+

 cat << EOF > $UNINSTALLER
 printf "It's recommended you run these steps manually.\n"
 printf "If you want to run the full script, open it in\n"
 cat << EOF > $UNINSTALLER
 printf "It's recommended you run these steps manually.\n"
 printf "If you want to run the full script, open it in\n"


@@ -181,12 +183,11 @@ done
 if [ -d "examples" ]; then
        if confirm "Would you like to copy examples to $RESOURCES_DIR?"; then
                inform "Copying examples to $RESOURCES_DIR"
 if [ -d "examples" ]; then
        if confirm "Would you like to copy examples to $RESOURCES_DIR?"; then
                inform "Copying examples to $RESOURCES_DIR"

-               mkdir -p $RESOURCES_DIR

                cp -r examples/ $RESOURCES_DIR
                echo "rm -r $RESOURCES_DIR" >> $UNINSTALLER
        fi
 fi
 
 success "\nAll done!"
                cp -r examples/ $RESOURCES_DIR
                echo "rm -r $RESOURCES_DIR" >> $UNINSTALLER
        fi
 fi
 
 success "\nAll done!"

-inform "If this is your first time installing you should reboot for hardware changes to tkae effect.\n"
+inform "If this is your first time installing you should reboot for hardware changes to take effect.\n"

 inform "Find uninstall steps in $UNINSTALLER\n"
 inform "Find uninstall steps in $UNINSTALLER\n"