Skip to content

Commit 256c3f4

Browse files
3d-gussner3d-gussner
committed
PF-build.sh:
- Add sort of variants. Request from @leptun - Add Arduino IDE 1.8.19 as an option - Allow upper and lower case. Request from @TojikCZ MK404-build.sh: - Allow upper and lower case. Request by @TojikCZ - Add update option to release OR devel
1 parent 92ec7d3 commit 256c3f4

File tree

2 files changed

+71
-31
lines changed

2 files changed

+71
-31
lines changed

‎MK404-build.sh

+60-24
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# 3. Install latest updates with 'sudo apt-get upgrade'
1111
#
1212
#
13-
# Version: 1.0.0-Build_13
13+
# Version: 1.0.0-Build_14
1414
# Change log:
1515
# 11 Feb 2021, 3d-gussner, Inital
1616
# 11 Feb 2021, 3d-gussner, Optional flags to check for updates
@@ -22,6 +22,8 @@
2222
# 18 Jun 2021, 3d-gussner, Added -g 3 and 4 for more details extrusion lines
2323
# 18 Jun 2021, 3d-gussner, Check for updates is default. Fix update if internet connection is lost.
2424
# 21 Jun 2021, 3d-gussner, Change board_flash argument to 'y' and firmware_version to 'f'
25+
# 25 Jan 2021, 3d-gussner, Allow upper and lower case in selection
26+
# Add update option to release OR devel
2527

2628
#### Start: Failures
2729
failures()
@@ -74,7 +76,7 @@ while getopts c:f:g:m:n:p:u:x:y:?h flag
7476
# '?' 'h' argument usage and help
7577
if [ "$help_flag" == "1" ] ; then
7678
echo "***************************************"
77-
echo "* MK404-build.sh Version: 1.0.0-Build_13 *"
79+
echo "* MK404-build.sh Version: 1.0.0-Build_14 *"
7880
echo "***************************************"
7981
echo "Arguments:"
8082
echo "$(tput setaf 2)-c$(tput sgr0) Check for update"
@@ -98,7 +100,7 @@ echo " -g : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' l
98100
echo " -m : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes '$(tput setaf 2)2$(tput sgr0)' with MMU2"
99101
echo " -n : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes"
100102
echo " -p : '$(tput setaf 2)MK25$(tput sgr0)', '$(tput setaf 2)MK25S$(tput sgr0)', '$(tput setaf 2)MK3$(tput sgr0)' or '$(tput setaf 2)MK3S$(tput sgr0)'"
101-
echo " -u : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes '"
103+
echo " -u : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' release ', '$(tput setaf 2)2$(tput sgr0)' devel '"
102104
echo " -x : '$(tput setaf 2)8$(tput sgr0)',$(tput setaf 2)16$(tput sgr0)',$(tput setaf 2)32$(tput sgr0)' or '$(tput setaf 2)64$(tput sgr0)' Kb."
103105
echo " -y : '$(tput setaf 2)256$(tput sgr0)','$(tput setaf 2)384$(tput sgr0)','$(tput setaf 2)512$(tput sgr0)','$(tput setaf 2)1024$(tput sgr0)''$(tput setaf 2)32M$(tput sgr0)'"
104106
echo
@@ -170,9 +172,8 @@ fi
170172
#Start: Check if new build is selected
171173
if [ "$new_build_flag" == "1" ]; then
172174
check_flag=1
173-
update_flag=1
174175
fi
175-
if [ "$update_flag" == "1" ]; then
176+
if [[ "$update_flag" == "1" || "$update_flag" == "2" ]]; then
176177
check_flag=1
177178
fi
178179
#End: Check if new build is selected
@@ -196,11 +197,13 @@ if [ ! -z $firmware_version_flag ]; then
196197
if [ ! -z $MK404_PRINTER_TEMP ]; then
197198
MK404_PRINTER=MK25S
198199
fi
200+
elif [[ ! -z $new_build_flag || ! -z $update_flag || ! -z $check_flag ]]; then
201+
echo "continue"
199202
else
200203
failures 8
201204
fi
202205

203-
if [ -z "$MK404_PRINTER" ]; then
206+
if [[ -z $MK404_PRINTER && -z $new_build_flag && -z $update_flag && -z $check_flag ]]; then
204207
failures 9
205208
fi
206209

@@ -232,7 +235,7 @@ if [ ! -z $mk404_printer_flag ]; then
232235
fi
233236
fi
234237

235-
if [ -z $MK404_PRINTER ]; then
238+
if [[ -z $MK404_PRINTER && -z $new_build_flag && -z $update_flag && -z $check_flag ]]; then
236239
failures 10
237240
fi
238241

@@ -399,38 +402,58 @@ if [ "$check_flag" == "1" ]; then
399402
# Get latest release
400403
MK404_release_url=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/$MK404_owner/$MK404_project/releases/latest)
401404
MK404_release_tag=$(basename $MK404_release_url)
402-
# Get remote Commit_Hash
403-
#MK404_remote_GIT_COMMIT_HASH=$(git ls-remote --heads $(git config --get remote.origin.url) | grep "refs/heads/master" | cut -f 1)
404-
MK404_remote_GIT_COMMIT_HASH=$(git ls-remote | grep "refs/tags/$MK404_release_tag" | cut -f 1)
405-
# Get remote Commit_Number
406-
MK404_remote_GIT_COMMIT_NUMBER=$(git rev-list $MK404_release_tag --count)
405+
# Get release Commit_Hash
406+
MK404_release_GIT_COMMIT_HASH=$(git ls-remote | grep "refs/tags/$MK404_release_tag" | cut -f 1)
407+
# Get release Commit_Number
408+
MK404_release_GIT_COMMIT_NUMBER=$(git rev-list $MK404_release_tag --count)
409+
# Get latest development Commit_Hash
410+
MK404_devel_GIT_COMMIT_HASH=$(git for-each-ref refs/remotes/origin/master | cut -d" " -f 1)
411+
# Get latest development Commit_Number
412+
MK404_devel_GIT_COMMIT_NUMBER=$(git rev-list refs/remotes/origin/master --count)
407413
# Output
408414
echo ""
409415
echo "Current version : $MK404_current_version"
410416
echo ""
411417
echo "Current local hash : $MK404_local_GIT_COMMIT_HASH"
412418
echo "Current local commit nr : $MK404_local_GIT_COMMIT_NUMBER"
413-
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_remote_GIT_COMMIT_HASH" ]; then
419+
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_release_GIT_COMMIT_HASH" ]; then
414420
echo "$(tput setaf 1)"
415421
else
416422
echo "$(tput setaf 2)"
417423
fi
418424
echo "Latest release tag : $MK404_release_tag"
419-
echo "Latest release hash : $MK404_remote_GIT_COMMIT_HASH"
420-
echo "Latest remote commit nr : $MK404_remote_GIT_COMMIT_NUMBER"
425+
echo "Latest release hash : $MK404_release_GIT_COMMIT_HASH"
426+
echo "Latest release commit nr: $MK404_release_GIT_COMMIT_NUMBER"
427+
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_devel_GIT_COMMIT_HASH" ]; then
428+
echo "$(tput setaf 1)"
429+
else
430+
echo "$(tput setaf 2)"
431+
fi
432+
echo "Latest devel hash : $MK404_devel_GIT_COMMIT_HASH"
433+
echo "Latest devel commit nr : $MK404_devel_GIT_COMMIT_NUMBER"
421434
echo "$(tput sgr 0)"
422435

423436
# Check for updates
424-
if [ ! -z $MK404_remote_GIT_COMMIT_HASH ]; then
425-
if [[ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_remote_GIT_COMMIT_HASH" && -z "$update_flag" ]]; then
426-
echo "$(tput setaf 2)Update is availible.$(tput sgr 0)"
427-
read -t 10 -n 1 -p "$(tput setaf 3)Update now Y/n$(tput sgr 0)" update_answer
428-
if [ "$update_answer" == "Y" ]; then
437+
if [ ! -z $MK404_release_GIT_COMMIT_HASH ]; then
438+
if [[ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_release_GIT_COMMIT_HASH" && -z "$update_flag" ]]; then
439+
echo "$(tput setaf 2)Update to release is availible.$(tput sgr 0)"
440+
read -t 10 -n 1 -p "$(tput setaf 3)Update to release now Y/n$(tput sgr 0)" update_answer
441+
if [[ "$update_answer" == "Y" || "$update_answer" == "y" ]]; then
429442
update_flag=1
430443
fi
431444
echo ""
432445
fi
433446
fi
447+
if [ ! -z $MK404_devel_GIT_COMMIT_HASH ]; then
448+
if [[ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_devel_GIT_COMMIT_HASH" && -z "$update_flag" ]]; then
449+
echo "$(tput setaf 2)Update to devel is availible.$(tput sgr 0)"
450+
read -t 10 -n 1 -p "$(tput setaf 3)Update to devel now Y/n$(tput sgr 0)" update_answer
451+
if [[ "$update_answer" == "Y" || "$update_answer" == "y" ]]; then
452+
update_flag=2
453+
fi
454+
echo ""
455+
fi
456+
fi
434457
fi
435458
}
436459
#### End: Check for updates
@@ -439,14 +462,27 @@ fi
439462
fetch_updates()
440463
{
441464
if [ "$update_flag" == "1" ]; then
442-
if [ ! -z $MK404_remote_GIT_COMMIT_HASH ]; then
443-
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_remote_GIT_COMMIT_HASH" ]; then
465+
if [ ! -z $MK404_release_GIT_COMMIT_HASH ]; then
466+
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_release_GIT_COMMIT_HASH" ]; then
444467
echo ""
445468
git fetch --all
446-
read -t 10 -p "$(tput setaf 2)Updating MK404 !$(tput sgr 0)"
469+
read -t 5 -p "$(tput setaf 2)Updating MK404 to release!$(tput sgr 0)"
447470
echo ""
448471
git reset --hard $MK404_release_tag
449-
read -t 10 -p "$(tput setaf 2)Compiling MK404 !$(tput sgr 0)"
472+
read -t 5 -p "$(tput setaf 2)Compiling MK404 release!$(tput sgr 0)"
473+
echo ""
474+
new_build_flag=1
475+
fi
476+
fi
477+
elif [ "$update_flag" == "2" ]; then
478+
if [ ! -z $MK404_devel_GIT_COMMIT_HASH ]; then
479+
if [ "$MK404_local_GIT_COMMIT_HASH" != "$MK404_devel_GIT_COMMIT_HASH" ]; then
480+
echo ""
481+
git fetch --all
482+
read -t 5 -p "$(tput setaf 2)Updating MK404 to devel!$(tput sgr 0)"
483+
echo ""
484+
git reset --hard origin/master
485+
read -t 5 -p "$(tput setaf 2)Compiling MK404 devel!$(tput sgr 0)"
450486
echo ""
451487
new_build_flag=1
452488
fi

‎PF-build.sh

+11-7
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE
5757
# it will use the default Arduino IDE folders and so can corrupt the build environment.
5858
#
59-
# Version: 2.0.0-Build_66
59+
# Version: 2.0.0-Build_67
6060
# Change log:
6161
# 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt'
6262
# 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown
@@ -166,6 +166,9 @@
166166
# 24 Jun 2021, 3d-gussner, Fix MK404 user interaction not to show if compiling 'All' variants
167167
# 24 Jun 2021, 3d-gussner, MK404 is only supported on Linux at this moment.
168168
# 03 Jan 2022, 3d-gussner, Remove calling lang-community.sh as not needed anymore
169+
# 21 Jan 2022, 3d-gussner, Sort variants
170+
# Add Arduino 1.8.19 as an option
171+
# 25 Jan 2022, 3d-gussner, Allow upper and lower case for MK404
169172

170173
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
171174

@@ -221,7 +224,7 @@ while getopts b:c:d:g:h:i:j:l:m:n:o:p:v:x:y:?h flag
221224
# '?' 'h' argument usage and help
222225
if [ "$help_flag" == "1" ] ; then
223226
echo "***************************************"
224-
echo "* PF-build.sh Version: 2.0.0-Build_66 *"
227+
echo "* PF-build.sh Version: 2.0.0-Build_67 *"
225228
echo "***************************************"
226229
echo "Arguments:"
227230
echo "$(tput setaf 2)-b$(tput sgr0) Build/commit number"
@@ -247,7 +250,7 @@ echo " -b : '$(tput setaf 2)Auto$(tput sgr0)' needs git or a number"
247250
echo " -c : '$(tput setaf 2)0$(tput sgr0)' clean up, '$(tput setaf 2)1$(tput sgr0)' keep"
248251
echo " -d : '$(tput setaf 2)GOLD$(tput sgr0)', '$(tput setaf 2)RC$(tput sgr0)', '$(tput setaf 2)BETA$(tput sgr0)', '$(tput setaf 2)ALPHA$(tput sgr0)', '$(tput setaf 2)DEBUG$(tput sgr0)', '$(tput setaf 2)DEVEL$(tput sgr0)' and '$(tput setaf 2)UNKNOWN$(tput sgr0)'"
249252
echo " -g : '$(tput setaf 2)0$(tput sgr0)' no '$(tput setaf 2)1$(tput sgr0)' lite '$(tput setaf 2)2$(tput sgr0)' fancy '$(tput setaf 2)3$(tput sgr0)' lite with Quad_HR '$(tput setaf 2)4$(tput sgr0)' fancy with Quad_HR"
250-
echo " -i : '$(tput setaf 2)1.8.5$(tput sgr0)', '$(tput setaf 2)1.8.13$(tput sgr0)'"
253+
echo " -i : '$(tput setaf 2)1.8.5$(tput sgr0)', '$(tput setaf 2)1.8.13$(tput sgr0)', '$(tput setaf 2)1.8.19$(tput sgr0)'"
251254
echo " -j : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes"
252255
echo " -l : '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_ONLY$(tput sgr0)' for English only"
253256
echo " -m : '$(tput setaf 2)0$(tput sgr0)' no, '$(tput setaf 2)1$(tput sgr0)' yes '$(tput setaf 2)2$(tput sgr0)' with MMU2"
@@ -343,7 +346,7 @@ fi
343346

344347
#Start: Check if Arduino IDE version is correct
345348
if [ ! -z "$IDE_flag" ]; then
346-
if [[ "$IDE_flag" == "1.8.5" || "$IDE_flag" == "1.8.13" ]]; then
349+
if [[ "$IDE_flag" == "1.8.5" || "$IDE_flag" == "1.8.13" || "$IDE_flag" == "1.8.19" ]]; then
347350
ARDUINO_ENV="${IDE_flag}"
348351
else
349352
ARDUINO_ENV="1.8.5"
@@ -818,7 +821,8 @@ if [ -z "$variant_flag" ] ; then
818821
while IFS= read -r -d $'\0' f; do
819822
options[i++]="$f"
820823
done < <(find Firmware/variants/ -maxdepth 1 -type f -name "*.h" -print0 )
821-
select opt in "${options[@]}" "All" "Quit"; do
824+
IFS=$'\n' sorted=($(sort -n <<<"${options[*]}")); unset IFS
825+
select opt in "${sorted[@]}" "All" "Quit"; do
822826
case $opt in
823827
*.h)
824828
VARIANT=$(basename "$opt" ".h")
@@ -1453,7 +1457,7 @@ if [[ "$output_flag" == "1" || -z "$output_flag" ]]; then
14531457
if [[ -z "$mk404_flag" && "$variant_flag" != "All" ]]; then
14541458
echo
14551459
read -t 10 -n 1 -p "Do you want to start MK404? Y/$(tput setaf 2)n$(tput sgr 0)" mk404_start
1456-
if [ "$mk404_start" == "Y" ]; then
1460+
if [[ "$mk404_start" == "Y" || "$mk404_start" == "y" ]]; then
14571461
echo
14581462
read -t 10 -n 1 -p "Do you want to start MK404 with or without MMU2S? $(tput setaf 2)1$(tput sgr 0)/2" mk404_choose1
14591463
if [ "$mk404_choose1" == "1" ]; then
@@ -1603,4 +1607,4 @@ done
16031607
finish_pf-build
16041608
if [ $TARGET_OS == "linux" ]; then
16051609
MK404_SIM
1606-
fi
1610+
fi

0 commit comments

Comments
 (0)