Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #!/bin/bash
- # betlog - 2019-07-10--22-50-50
- #
- # backup relevant files
- # remove folder contents
- # git clone new marlin into fiolder
- # diff backups with new files
- sourceArray=(
- /Marlin/Configuration_adv.h
- /Marlin/Configuration.h
- /platformio.ini
- )
- sourceDir="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825"
- backupDir="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825__BACKUP"
- #------------------------------------------
- backupStamp=$(date +%Y-%m-%d--%H-%M-%S)
- kdialog --title "OK?" --yesnocancel "YES - BACKUP/MAKE THE FOLDERS\nNO - JUST MELD"
- mainQ=$?
- if [[ $mainQ -lt 2 ]]; then
- if [[ $mainQ -eq 0 ]]; then
- # echo "mkdir --parents ${backupDir}/${backupStamp}"
- mkdir --parents "${backupDir}/${backupStamp}"
- for sourceItem in ${sourceArray[@]}; do
- # echo "rsync -av ${sourceDir}${sourceItem} ${backupDir}/${backupStamp}"
- rsync -av "${sourceDir}${sourceItem}" "${backupDir}/${backupStamp}"
- done
- # echo "mv ${sourceDir} ${sourceDir}__${backupStamp}"
- mv "${sourceDir}" "${sourceDir}__${backupStamp}"
- echo "mkdir ${sourceDir}"
- mkdir "${sourceDir}"
- cd "${sourceDir}"
- # cd ${sourceDir%/*}
- # echo "git clone -b bugfix-2.0.x --single-branch https://github.com/MarlinFirmware/Marlin.git"
- kdialog --title "OK?" --yesno "GIT CLONE MARLIN?"
- if [[ $? -eq 0 ]]; then
- git clone -b bugfix-2.0.x --single-branch https://github.com/MarlinFirmware/Marlin.git . #the period omits the additonal Marlin folder!!!
- echo "Ok, Cloned"
- # mv "${sourceDir%/*}/Marlin" "${sourceDir}"
- fi
- fi
- if [[ $mainQ -eq 1 ]]; then
- backupStamp=$(find ${backupDir} -type d -prune -exec ls -t {} \; |head -1)
- # backupStamp=$(find ${backupDir}/ -type d -prune -exec ls -t ????-??-??--??-??-?? {} \; |head -1)
- fi
- for originalFile in ${sourceArray[@]}; do
- marlin="${sourceDir}${originalFile}"
- mine="${backupDir}/${backupStamp}${originalFile}"
- # was intended to copy absent platform.io over... but it's always included.. so just do regualr diff
- # if [[ ! -f "${marlin}" ]]; then
- # echo "COPYING TO NON EXISTANT FILE:"
- # echo "cp ${mine} --->>> ${marlin}"
- # cp "${mine}" "${marlin}"
- # fi
- echo "meld ${marlin} ${mine}"
- echo "MARLIN on left <<<push<<< MINE on right"
- meld "${marlin}" "${mine}"
- done
- fi
- echo FINISHED
- # exit
- #
- # just A STOP-GAP BEFORE I ADDED OTHER CODE
- #
- # marlin="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825/Marlin/Configuration.h"
- # mine="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825__BACKUP/2019-07-10--23-25-30/Marlin/Configuration.h"
- # meld "${marlin}" "${mine}"
- #
- # marlin="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825/Marlin/Configuration_adv.h"
- # mine="/home/user/3Dprints/_FIRMWARE/_ACTIVE_/Marlin-bugfix-2.0.x__i3-RAMPS-DRV8825__BACKUP/2019-07-10--23-25-30/Marlin/Configuration_adv.h"
- # meld "${marlin}" "${mine}"
Advertisement
Add Comment
Please, Sign In to add comment