Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Cleanup of software update |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b9d5d09cd4fcb7e3a89bfef99e932698 |
User & Date: | admin 2016-04-08 04:06:15 |
Context
2016-04-08
| ||
04:25 | update softwareupdate check-in: 0e2fc70f7b user: admin tags: trunk | |
04:06 | Cleanup of software update check-in: b9d5d09cd4 user: admin tags: trunk | |
2015-11-15
| ||
22:29 | Update softwareupdate code check-in: 95ea150de6 user: admin tags: trunk | |
Changes
Changes to softwareupdate/softwareupdate.tcl.
︙ | ︙ | |||
84 85 86 87 88 89 90 | set versionnumber [string trim [$sparkledata selectNodes -namespaces [list x "http://www.andymatuschak.org/xml-namespaces/sparkle"] {string(//enclosure/@x:version)}] .0] set changedata [$sparkledata selectNodes {string(//description/text())}] set minOS [$sparkledata selectNodes -namespaces [list x "http://www.andymatuschak.org/xml-namespaces/sparkle"] {string(//x:minimumSystemVersion)}] | | > > | > > > > > > > > > > > > < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | | < < < | < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | set versionnumber [string trim [$sparkledata selectNodes -namespaces [list x "http://www.andymatuschak.org/xml-namespaces/sparkle"] {string(//enclosure/@x:version)}] .0] set changedata [$sparkledata selectNodes {string(//description/text())}] set minOS [$sparkledata selectNodes -namespaces [list x "http://www.andymatuschak.org/xml-namespaces/sparkle"] {string(//x:minimumSystemVersion)}] if {[tk windowingsystem] eq "aqua"} { set hostOS [exec sw_vers -productVersion] if {![package vsatisfies $hostOS $minOS]} { tk_messageBox -icon warning -message "Error!" -detail "$appname is not supported on Mac OS X $hostOS. The minimum supported OS version is $minOS." return } } if {[expr $currentversion < $versionnumber]} { switch [tk windowingsystem] { "aqua" { softwareupdate::updatePitch } "win32" { softwareupdate::winPitch $appname $currentversion $oldversion } "x11" { } } } else { softwareupdate::upToDate } } #define the current version of the software proc setVersion {app number} { variable currentversion variable appname set currentversion $number set appname $app } #get the current installation path proc findCurrentInstallation {} { variable currentinstall variable appname switch [tk windowingsystem] { "aqua" { set approot [info nameofexecutable] set apppath [split $approot /] set currentinstall [join [lrange $apppath 0 [lsearch $apppath "*.app"]] / ] } "win32" { set currentinstall [file join $::env(APPDATA) ${appname}_App] } "x11" { return } } return $currentinstall } #prompt user to update: for Perl, which chokes on XML parsing from Tcl proc updatePitchPerl {apptitle appnumber currentapp changelog} { variable appname variable icon variable changedata variable currentversion variable versionnumber variable changelist catch {destroy .updateprogress} catch {destroy .update} toplevel .update wm title .update "Software Update" wm withdraw .update frame .update.f -bg gray95 pack .update.f -fill both -expand yes frame .update.f.top -bg gray95 pack .update.f.top -fill both -expand yes label .update.f.top.i -image $icon -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.i -side left -fill both -expand yes frame .update.f.top.r -bg gray95 pack .update.f.top.r -side right -fill both -expand yes label .update.f.top.r.title -text "A new version of $apptitle is available!" -font {-weight bold} -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.r.title -fill both -expand yes -side top label .update.f.top.r.msg -text "$apptitle $appnumber is available--you have $currentapp. Would you like to download it now?" -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.r.msg -fill both -expand yes -side top label .update.f.top.r.release -text "Release Notes:" -font {-weight bold} -relief flat -highlightthickness 0 -bg gray95 pack .update.f.top.r.release -side top -fill both -expand yes text .update.f.top.r.text -font TkDefaultFont pack .update.f.top.r.text -side top -fill both -expand yes ttk::frame .update.f.top.r.bottom -padding 5 pack .update.f.top.r.bottom -side bottom -fill both -expand yes ttk::button .update.f.top.r.bottom.skip -text "Skip This Version" -command {destroy .update} ttk::button .update.f.top.r.bottom.install -text "Install Update" -default active -command softwareupdate::installUpdate pack .update.f.top.r.bottom.install .update.f.top.r.bottom.skip -side right -fill both -expand yes set changetext [split $changelog *] set changetext [lrange $changetext 1 end] foreach item $changetext { .update.f.top.r.text insert end "* $item\n" } .update.f.top.r.text configure -state disabled wm resizable .update 0 0 wm deiconify .update raise .update wm transient .update . } #prompt user to update proc updatePitch {} { variable appname variable icon variable changedata variable currentversion variable versionnumber catch {destroy .updateprogress} catch {destroy .update} toplevel .update wm title .update "Software Update" wm withdraw .update frame .update.f -bg gray95 pack .update.f -fill both -expand yes frame .update.f.top -bg gray95 pack .update.f.top -fill both -expand yes label .update.f.top.i -image $icon -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.i -side left -fill both -expand yes frame .update.f.top.r -bg gray95 pack .update.f.top.r -side right -fill both -expand yes label .update.f.top.r.title -text "A new version of $appname is available!" -font {-weight bold} -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.r.title -fill both -expand yes -side top label .update.f.top.r.msg -text "$appname $versionnumber is available--you have $currentversion. Would you like to download it now?" -font {-size 10} -bg gray95 -relief flat -highlightthickness 0 pack .update.f.top.r.msg -fill both -expand yes -side top label .update.f.top.r.release -text "Release Notes:" -font {-size 10 -weight bold} -relief flat -highlightthickness 0 -bg gray95 pack .update.f.top.r.release -side top -fill both -expand yes text .update.f.top.r.text -font TkDefaultFont pack .update.f.top.r.text -side top -fill both -expand yes ttk::frame .update.f.top.r.bottom -padding 5 pack .update.f.top.r.bottom -side bottom -fill both -expand yes ttk::button .update.f.top.r.bottom.skip -text "Skip This Version" -command {destroy .update} ttk::button .update.f.top.r.bottom.install -text "Install Update" -default active -command softwareupdate::installUpdate pack .update.f.top.r.bottom.install .update.f.top.r.bottom.skip -side right -fill both -expand yes .update.f.top.r.text insert end $changedata .update.f.top.r.text configure -state disabled wm resizable .update 0 0 wm deiconify .update raise .update wm transient .update . } proc winPitch {name newversion oldversion} { set answer [tk_messageBox -icon info -title "New Version Available" -message "New Version Available" -detail "$name $newversion is available--you have $oldversion. Would you like to download it now?" -type yesno ] switch -- $answer { yes { xplat::launch http://www.codebykevin.com/$name.html } no { return } } } #"busy" dialog proc checkingForUpdates {} { variable appname variable icon catch {destroy .updateprogress} toplevel .updateprogress wm title .updateprogress "Updating $appname" wm withdraw .updateprogress update idletasks ttk::frame .updateprogress.f -padding 5 pack .updateprogress.f -fill both -expand yes label .updateprogress.f.l -bg gray95 -image $icon -bd 0 -relief flat -highlightthickness 0 -width [image width $icon] -height [image height $icon] pack .updateprogress.f.l -side left -fill both -expand yes frame .updateprogress.f.r -bg gray95 -bd 0 -highlightcolor gray95 pack .updateprogress.f.r -side right -fill both -expand yes ttk::label .updateprogress.f.r.t -text "Checking for updates..." -padding 5 pack .updateprogress.f.r.t -side top -fill both -expand yes ttk::frame .updateprogress.f.r.f -padding 5 pack .updateprogress.f.r.f -side top -fill both -expand yes ttk::progressbar .updateprogress.f.r.f.progress -mode indeterminate -orient horizontal pack .updateprogress.f.r.f.progress -fill both -expand yes -side top .updateprogress.f.r.f.progress start ttk::button .updateprogress.f.r.f.b -text "Cancel" -command {destroy .updateprogress} pack .updateprogress.f.r.f.b -side bottom -fill both -expand no wm geometry .updateprogress 400x100 wm resizable .updateprogress 0 0 wm deiconify .updateprogress raise .updateprogress wm transient .updateprogress . } #dialog if current version is installed proc upToDate {} { variable appname variable currentversion catch {destroy .updateprogress} tk_messageBox -icon info -title "Up to Date" -message "You're up to date!" -detail "$appname $currentversion is the currently the newest version available." } #show progress of installation proc progressDialog {} { variable appname variable status variable icon catch {destroy .downloadprogress} toplevel .downloadprogress wm title .downloadprogress "Updating $appname" wm transient .downloadprogress . label .downloadprogress.label -image $icon -anchor w -bg gray95 -highlightthickness 0 pack .downloadprogress.label -side left -fill both -expand yes ttk::frame .downloadprogress.frame -padding 5 pack .downloadprogress.frame -side right -fill both -expand yes ttk::label .downloadprogress.frame.l -textvariable softwareupdate::status -width 40 -text "" pack .downloadprogress.frame.l -side top -fill both -expand yes ttk::progressbar .downloadprogress.frame.bar -mode indeterminate -orient horizontal -maximum 100 pack .downloadprogress.frame.bar -side top -fill both -expand yes .downloadprogress.frame.bar start update ttk::button .downloadprogress.frame.b -text "Cancel" -command {destroy .updateprogress} pack .downloadprogress.frame.b -side right -fill both -expand no wm geometry .downloadprogress 400x100 wm resizable .downloadprogress 0 0 } #download and install the update proc installUpdate {} { variable currentinstall variable status variable appname variable tmpdir catch {destroy .update} softwareupdate::findCurrentInstallation softwareupdate::progressDialog set status "Downloading update for $appname" switch [tk windowingsystem] { "aqua" { http::geturl http://www.codebykevin.com/updates/[list $appname].tgz -channel [open $tmpdir/[list $appname].tgz w] update after 1000 cd $tmpdir set status "Unpacking update for $appname" update after 1000 catch {exec tar xvfz [list $appname].tgz} } "win32" { http::geturl http://www.codebykevin.com/updates/[list $appname].exe -channel [open $tmpdir/[list $appname].exe w] } "x11" { tk_messageBox -icon info -parent . -message "Please ask the maintainer of $appname on your platform to prepare a release of the latest version." return } } set status "Ready to install" .downloadprogress.frame.bar configure -mode determinate .downloadprogress.frame.bar configure -value 100 .downloadprogress.frame.bar stop destroy .downloadprogress.frame.b pack [ttk::button .downloadprogress.frame.b -text "Install and Relaunch" -command softwareupdate::launchUpdate] -side right -fill both -expand no return } #launch the update proc launchUpdate {} { variable currentinstall variable appname variable tmpdir switch [tk windowingsystem] { "aqua" { if {[catch {exec codesign -v $tmpdir/$appname.app} msg]} { bgerror $msg tk_messageBox -icon warning -message "Error!" -detail "An error occurred in the installation of $appname. Please try again later." return } else { file rename -force $currentinstall [file join /Users [exec whoami] .Trash [file tail $currentinstall]] file rename -force $tmpdir/$appname.app $currentinstall exec $currentinstall/Contents/MacOS/$appname & exit } } "win32" { } } catch {destroy .downloadprogress} } namespace export * } |