Merge pull request #6 from arduino/installation

Better output during installation

Author: ubidefeo

install.sh

@@ -19,38 +19,97 @@ LIBDIR="lib"
 #   File "<stdin>", line 2, in <module>
 # OSError: [Errno 17] EEXIST
 
-echo "Creating $LIBDIR on board"
-mpremote mkdir "${LIBDIR}"
-echo "Creating $LIBDIR/$PKGDIR on board"
-mpremote mkdir "/${LIBDIR}/${PKGDIR}"
+# Check if a directory exists
+# Returns 0 if directory exists, 1 if it does not
+function directory_exists {
+  # Run mpremote and capture the error message
+  error=$(mpremote fs ls $1)
+
+  # Return error if error message contains "OSError: [Errno 2] ENOENT"
+  if [[ $error == *"OSError: [Errno 2] ENOENT"* ]]; then
+      return 1
+  else
+      return 0
+  fi
+}
+
+# Copies a file to the board using mpremote
+# Only produces output if an error occurs
+function copy_file {
+  echo "Copying $1 to $2"
+  # Run mpremote and capture the error message
+  error=$(mpremote cp $1 $2)
+
+  # Print error message if return code is not 0
+  if [ $? -ne 0 ]; then
+    echo "Error: $error"
+  fi
+}
+
+# Deletes a file from the board using mpremote
+# Only produces output if an error occurs
+function delete_file {
+  echo "Deleting $1"
+  # Run mpremote and capture the error message
+  error=$(mpremote rm $1)
+
+  # Print error message if return code is not 0
+  if [ $? -ne 0 ]; then
+    echo "Error: $error"
+  fi
+}
+
+echo "Installing Arduino Runtime for MicroPython"
+
+# If directories do not exist, create them
+if ! directory_exists "/${LIBDIR}"; then
+  echo "Creating $LIBDIR on board"
+  mpremote mkdir "${LIBDIR}"
+fi
+
+if ! directory_exists "/${LIBDIR}/${PKGDIR}"; then
+  echo "Creating $LIBDIR/$PKGDIR on board"
+  mpremote mkdir "/${LIBDIR}/${PKGDIR}"
+fi
+
 
 ext="py"
 if [ "$1" = "mpy" ]; then
   ext=$1
-  echo "* * *"
   echo ".py files will be compiled to .mpy"
-  echo "* * *"
 fi
 
-for py in $SRCDIR/*; do
-    f_name=`basename $py`
-    if [ "$ext" = "mpy" ]; then
+existing_files=$(mpremote fs ls ":/${LIBDIR}/${PKGDIR}")
+
+for filename in $SRCDIR/*; do
+    f_name=`basename $filename`
+    source_extension="${f_name##*.}"
+    destination_extension=$source_extension
+
+    if [ "$ext" = "mpy" ] && [ "$source_extention" = "py" ]; then
       echo "Compiling $SRCDIR/$f_name to $SRCDIR/${f_name%.*}.$ext"
       mpy-cross "$SRCDIR/$f_name"
+      destination_extension=$ext
     fi
 
-    echo "Deleting files from board"
-    mpremote rm ":/${LIBDIR}/$PKGDIR/${f_name%.*}.py"
-    mpremote rm ":/${LIBDIR}/$PKGDIR/${f_name%.*}.mpy"
+    # Make sure previous versions of the given file are deleted.
+    if [[ $existing_files == *"${f_name%.*}.$source_extension"* ]]; then
+      delete_file ":/${LIBDIR}/$PKGDIR/${f_name%.*}.$source_extension"
+    fi
+
+    # Check if source file has a .py extension and if a .mpy file exists on the board
+    if [ "$source_extension" = "py" ] && [[ $existing_files == *"${f_name%.*}.mpy"* ]]; then
+      delete_file ":/${LIBDIR}/$PKGDIR/${f_name%.*}.mpy"
+    fi
 
-    echo "Copying $SRCDIR/${f_name%.*}.$ext to :/${LIBDIR}/$PKGDIR/${f_name%.*}.$ext"
-    mpremote cp $SRCDIR/${f_name%.*}.$ext ":/${LIBDIR}/$PKGDIR/${f_name%.*}.$ext" 
+    # Copy either the .py or .mpy file to the board depending on the chosen option
+    copy_file $SRCDIR/${f_name%.*}.$destination_extension ":/${LIBDIR}/$PKGDIR/${f_name%.*}.$destination_extension"
 done
 
 if [ "$ext" = "mpy" ]; then
   echo "cleaning up mpy files"
   rm $SRCDIR/*.mpy
 fi
 
-echo "resetting target board"
+echo "Done. Resetting target board ..."
 mpremote reset