Skip to content

Commit e91b6fd

Browse files
Update bootstrap and tooling instructions (#1417)
* Update bootstrap with sleeps to view error/success in PowerShell * Update tooling instructions with latest tool versions
1 parent 3308df3 commit e91b6fd

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.mystools/README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,26 @@ sudo make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS
127127
### Install AStyle
128128
129129
# Download
130-
iwr 'https://sourceforge.net/projects/astyle/files/astyle/astyle%202.05.1/AStyle_2.05.1_windows.zip/download' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile astyle.2.05.zip
130+
iwr 'https://netix.dl.sourceforge.net/project/astyle/astyle/astyle%203.1/AStyle_3.1_windows.zip' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile astyle.3.1.zip
131131
132132
# Unzip the filed & move the C:\Program Files
133-
expand-archive astyle.2.05.zip
134-
mv .\astyle.2.05 'C:\Program Files\AStyle\'
133+
expand-archive astyle.3.1.zip
134+
mv .\astyle.3.1.zip\AStyle 'C:\Program Files\AStyle'
135135
136136
# Add AStyle to your path
137+
[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Program Files\AStyle\bin")
137138
[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Program Files\AStyle\bin", [EnvironmentVariableTarget]::Machine)
138139
139140
### Install Cppcheck (either 64-bit or 32-bit depending upon your version of Windows - pick one below)
140141
141142
# 64-bit
142-
iwr 'http://github.com/danmar/cppcheck/releases/download/1.76.1/cppcheck-1.76.1-x64-Setup.msi' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile cppcheck-1.76.1-Setup.msi
143+
iwr 'https://github.com/danmar/cppcheck/releases/download/1.88/cppcheck-1.88-x64-Setup.msi' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile cppcheck-1.88-Setup.msi
143144
144145
# 32-bit
145-
iwr 'http://github.com/danmar/cppcheck/releases/download/1.76.1/cppcheck-1.76.1-x86-Setup.msi' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile cppcheck-1.76.1-Setup.msi
146+
iwr 'https://github.com/danmar/cppcheck/releases/download/1.88/cppcheck-1.88-x86-Setup.msi' -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox -OutFile cppcheck-1.88-Setup.msi
146147
147148
# Launch installer to install Cppcheck
148-
& .\cppcheck-1.76.1-Setup.msi
149+
& .\cppcheck-1.88-Setup.msi
149150
150151
### Add Cppcheck to your path
151152
[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Program Files\Cppcheck", [EnvironmentVariableTarget]::Machine)

.mystools/bootstrap-dev.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ check_tool_prerequisite()
2121
local version=$(${1} --version 2>&1 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p')
2222
if [ $(ver ${version}) -lt $(ver ${2}) ]; then
2323
warn "Found ${1} ${version} however, version ${2} or greater is required..."
24-
return 1
24+
sleep 3 && return 1
2525
else
2626
log "Found ${1} ${version}"
2727
fi
2828
else
2929
warn "${1} not installed or not in current path."
30-
return 1
30+
sleep 3 && return 1
3131
fi
3232
}
3333

@@ -89,3 +89,5 @@ configure_git_tool_aliases || err "Failed to create git aliases due to error $?.
8989
bootstrap_version "--set"
9090

9191
info "Successfully configured your repo for MySensors development... Thanks for your support!"
92+
93+
sleep 3

0 commit comments

Comments
 (0)