.. commit more often

Author: andersdra

Dockerfile

@@ -39,15 +39,14 @@ ARG C_HOME="/home/${C_USER}"
 ARG C_UID=1000
 ARG C_GUID=1000
 
-ARG ADDITIONAL_PACKAGES
-
 ARG MPLABX_IDE=1
 ARG MPLABX_IDE_START=1
 ARG MPLABX_IPE=0
 ARG MPLABX_TELEMETRY=0
 ARG MPLABX_DARCULA=1
 ARG MPLABX_VERSION=0
 ARG DIRTY_CLEANUP=0
+ARG ADDITIONAL_PACKAGES
 
 ARG ARDUINO=0
 ARG AVRGCC=0

docker-compose.yml

@@ -11,13 +11,7 @@ services:
     volumes:
      - /tmp/.X11-unix:/tmp/.X11-unix:ro
      - /dev/bus/usb:/dev/bus/usb
-     - ./MPLABX_Folders/MPLABXProjects:/mplabx/MPLABXProjects
-     - ./MPLABX_Folders/cache:/mplabx/.cache
-     - ./MPLABX_Folders/java:/mplabx/.java
-     - ./MPLABX_Folders/mchp_packs:/mplabx/.mchp_packs
-     - ./MPLABX_Folders/mplab_ide:/mplabx/.mplab_ide
-     - ./MPLABX_Folders/mplabcomm:/mplabx/.mplabcomm
-     - ./MPLABX_Folders/oracle_jre_usage:/mplabx/.oracle_jre_usage
+     - ./mplabx:/home/mplabx
     device_cgroup_rules:
      - 'c 189:* rmw'
     cap_drop:

scripts/mplabx/init.bash

@@ -2,17 +2,11 @@
 
 mkdir -p /usr/share/man/man1 # long forgotten, but fixes some error
 
-dpkg --add-architecture i386
 apt-get update
 apt-get -qq install --yes --no-install-recommends \
     bc \
     ca-certificates \
     curl \
-    libc6:i386 \
-    libx11-6:i386 \
-    libxext6:i386 \
-    libstdc++6:i386 \
-    libexpat1:i386 \
     libgail18 \
     libgtk2.0-0 \
     libgtk2.0-bin \
@@ -33,23 +27,37 @@ apt-get -qq install --yes --no-install-recommends \
     xz-utils \
     x11-utils "$ADDITIONAL_PACKAGES"
 
-wait
 
-V535MINUS=0
-if [ "$MPLABX_VERSION" -gt 0 ]
-  then
-    V535MINUS=$(bc -l <<< "$MPLABX_VERSION < 5.35")
-fi
+V535MINUS=$(bc -l <<< "$MPLABX_VERSION <= 5.35")
 
+# mplabx >= v5.40 will be 64bit
 if [ "$V535MINUS" -eq 1 ]
+then
+  dpkg --add-architecture i386
+  apt-get update
+  apt-get -qq install --yes --no-install-recommends \
+    libc6:i386 \
+    libx11-6:i386 \
+    libxext6:i386 \
+    libstdc++6:i386 \
+    libexpat1:i386
+fi
+
+V530MINUS=0
+if [ "$MPLABX_VERSION" -gt 0 ]
   then
-    apt-get install --yes  --no-install-recommends default-jre
+    V530MINUS=$(bc -l <<< "$MPLABX_VERSION <= 5.30")
+    if [ "$V530MINUS" -eq 1 ]
+    then
+      # is this even needed after adding JAVA_HOME?
+      apt-get install --yes --no-install-recommends default-jre
+    fi
 fi
 
 /create_user.bash \
-  && /mplabx_install.bash \
-  && /toolchain_install.bash \
-  && /startup_script.bash
+&& /mplabx_install.bash \
+&& /toolchain_install.bash \
+&& /startup_script.bash
 
 if [ ! "$C_USER" = root ]
   then
@@ -60,8 +68,8 @@ fi
 /cleanup.bash
 apt-get purge --yes bc curl procps make xz-utils
 apt-get -qq clean autoclean \
-  && rm --recursive --force /usr/share/man/* \
-  && rm --recursive --force /tmp/* \
-  && rm --recursive --force /var/log/* \
-  && bash -c 'rm --recursive --force /var/lib/{apt,dpkg,cache,log}/*' \
-  && find / -maxdepth 1 -name "*.bash" -delete
+&& rm --recursive --force /usr/share/man/* \
+&& rm --recursive --force /tmp/* \
+&& rm --recursive --force /var/log/* \
+&& rm --recursive --force /var/lib/{apt,dpkg,cache,log}/* \
+&& find / -maxdepth 1 -name "*.bash" -delete

scripts/mplabx/mplabx_install.bash

@@ -51,7 +51,13 @@ fi
 
 if [ "$CUSTOM_VERSION" -gt 0 ]
   then
-    MPLABX_URL="https://ww1.microchip.com/downloads/en/DeviceDoc/MPLABX-v$MPLABX_VERSION-linux-installer.tar"
+    if python -c "exit(0) if $MPLABX_VERSION * 100 % 5 == 0 else exit(1)" # confirm version ending in [.05, .10] etc
+    then
+      MPLABX_URL="https://ww1.microchip.com/downloads/en/DeviceDoc/MPLABX-v$MPLABX_VERSION-linux-installer.tar"
+    else
+      echo "Incorrect MPLABX version: $MPLABX_VERSION"
+      exit 1
+    fi
 fi
 
 printf '\nMPLAB X\n'
@@ -68,4 +74,14 @@ if [ "$MPLABX_DARCULA" -eq 1 ]
     curl "$DARCULA_URL" > "$C_HOME/darcula_theme.nbm"
 fi
 
+cd "$C_HOME" \
+&& mkdir MPLABXProjects \
+      .cache \
+      .java \
+      .mchp_packs \
+      .mplabcomm \
+      .mplab_ide \
+      .oracle_jre_usage
+
+
 rm --recursive --force /tmp/*

scripts/mplabx/startup_script.bash

@@ -16,10 +16,15 @@ if [ "$MPLABX_IDE_START" -eq 1 ]
     cat > /mplab_start.sh << EOF
 #!/bin/sh
 export JAVA_HOME="$JAVA_HOME"
-export PATH="$path$PATH"
-mplab_ide
+export PATH="$JAVA_HOMEbin:$path$PATH"
+/usr/bin/mplab_ide
 EOF
   else
-    printf '#!/bin/bash\nbash --login' > /mplab_start.sh
+    cat > /mplab_start.sh << EOF
+#!/bin/sh
+export JAVA_HOME="$JAVA_HOME"
+export PATH="$JAVA_HOME:$path$PATH"
+/bin/bash --login'
+EOF
 fi
 chmod 775 /mplab_start.sh

scripts/mplabx/toolchain_install.bash

@@ -3,6 +3,7 @@
 # download and install toolchains
 
 # ARDUINO
+# TODO: this has never worked, problem with plugin/procedure
 if [ "$ARDUINO" -eq 1 ]
   then
     printf '\nARDUINO\n'

scripts/tool_dl/init.bash

@@ -1,21 +1,25 @@
 #!/bin/sh
 
-if [ "$MCP_USER" ]
+if [ "$MCP_USER" ] && [ "$MCP_PASS" ]
 then
   apt-get update \
   && apt-get install --yes firefox-esr \
-    findutils \
-    xvfb
+     findutils \
+     xvfb
   pip3 install selenium \
-  wget \
-  && latest_release="$(curl https://github.com/mozilla/geckodriver/releases | grep -io "/mozilla/geckodriver/releases/download/v0.[0-9]*.[0-9]*/geckodriver-v0.[0-9]*.[0-9]*-linux64.tar.gz" | head -1)" \
+  && latest_release="$(curl https://github.com/mozilla/geckodriver/releases 2> /dev/null \
+    | grep -io \
+"/mozilla/geckodriver/releases/download/v0.[0-9]*.[0-9]*/geckodriver-v0.[0-9]*.[0-9]*-linux64.tar.gz" \
+    | head -1)" \
   && echo 'Downloading geckodriver' \
   && wget --quiet "https://github.com$latest_release" \
   && tar xf geckodriver*.tar.gz \
   && mv geckodriver /bin \
   && mkdir /toolchains
     /kill_firefox.bash &
+    echo 'Starting downloader'
     xvfb-run /toolchains.py
 else
-  /toolchains.py
+  echo 'No user/password combo input for myMicrochip downloads'
+  exit 0 # self provided url's or ide/ipe only
 fi

scripts/tool_dl/toolchains.py

@@ -3,12 +3,13 @@
 # needs a valid microchip user
 import os
 import sys
-import wget
 import pickle
 import multiprocessing as mp
 from time import sleep
 from selenium import webdriver
 
+toolchains = ['AVRGCC', 'ARMGCC', 'MCPXC8', 'MCPXC16', 'MCPXC32', 'MPLAB_HARMONY', 'PIC32_LEGACY', 'OTHERMCU']
+
 profile = webdriver.FirefoxProfile()
 # remove download dialog, set download directory etc
 profile.set_preference('browser.preferences.instantApply', True)
@@ -63,22 +64,23 @@ def check_downloads():
             sleep(1)
             check_downloads()
 
-
 try:
     mcp_login(os.environ['MCP_USER'], os.environ['MCP_PASS'])
-except TypeError:
-    print('No Microchip user/pass input')
+except:
+    print('myMicrochip login error')
+    sys.exit(1)
 
-toolchains = ['AVRGCC', 'ARMGCC', 'MCPXC8', 'MCPXC16', 'MCPXC32', 'MPLAB_HARMONY', 'PIC32_LEGACY', 'OTHERMCU']
 for tool in toolchains:
     if tool in os.environ:
-        url = os.environ[tool + '_URL']
-        if '.microchip.com' in url:
-            print('Started download of {}'.format(tool))
-            mcp_get(os.environ[tool + '_URL'])
-            sleep(5)
-        else:
-            print('User defined URL of {}, will be downloaded later'.format(tool))
+        if os.environ[tool] == '1':
+            url = os.environ[tool + '_URL']
+            if '.microchip.com' in url:
+                print('Starting download of {}'.format(tool))
+                mcp_get(os.environ[tool + '_URL'])
+                sleep(5)
+            else:
+                print('User defined URL of {} will be downloaded later'.format(tool))
 
 check_downloads()
 sys.exit(0)
+