Skip to content

Commit

Permalink
*** empty log message ***
Browse files Browse the repository at this point in the history
  • Loading branch information
john committed Sep 22, 2020
1 parent ab6dd49 commit f433940
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
12 changes: 6 additions & 6 deletions makede1.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ package require de1_gui

#file link "/d/admin/code/de1beta/desktop_app/linux" "/d/admin/code/de1beta/desktop_app/decent"
#file link "/d/admin/code/de1beta/desktop_app/linux" "/d/admin/code/de1beta/desktop_app/decent"
catch { file link "/d/admin/code/de1beta/desktop_app/linux/src" "/d/download/sync/de1plus" }
catch { file link "/d/admin/code/de1beta/desktop_app/osx/Decent.app/Contents/Resources/de1plus" "/d/download/sync/de1plus" }
catch { file link "/d/admin/code/de1beta/desktop_app/win32/src" "/d/download/sync/de1plus" }
catch { file link "/d/admin/code/de1beta/desktop_app/linux/src" "/d/download/sync/de1beta" }
catch { file link "/d/admin/code/de1beta/desktop_app/osx/Decent.app/Contents/Resources/de1plus" "/d/download/sync/de1beta" }
catch { file link "/d/admin/code/de1beta/desktop_app/win32/src" "/d/download/sync/de1beta" }

if {$argv != ""} {
puts "Updating apps"

# optionally purge the source directories and resync
# do this if we remove files from the sync list
file delete -force /d/download/sync/de1plus
file delete -force /d/download/sync/de1beta
file delete -force /d/download/sync/decent
file mkdir /d/download/sync/de1plus
file link /d/download/sync/decent /d/download/sync/de1plus
file mkdir /d/download/sync/de1beta
file link /d/download/sync/decent /d/download/sync/de1beta
#file delete -force /d/download/sync/de1
file delete -force /d/download/desktop/osx/decent_osx.zip
file delete -force /d/download/desktop/win32/decent_win.zip
Expand Down
3 changes: 2 additions & 1 deletion misc.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,8 @@ proc make_de1_dir {} {

set srcdir "/d/admin/code/de1beta"
#set destdirs [list "/d/download/sync/de1" "/d/download/sync/de1plus" "/d/download/sync/de1plusbig"]
set destdirs [list "/d/download/sync/de1plus"]
#set destdirs [list "/d/download/sync/de1plus"]
set destdirs [list "/d/download/sync/de1beta"]

# load the local manifest into memory
foreach {filename filesize filemtime filesha} [string trim [read_file "[homedir]/complete_manifest.txt"]] {
Expand Down
14 changes: 8 additions & 6 deletions updater.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,9 @@ proc log_to_debug_file {text} {
catch {
set ::logfile_handle [open "[homedir]/$::settings(logfile)" w]


# per https://3.basecamp.com/3671212/buckets/7351439/messages/3033510129#__recording_3039704280
# logging is always fast now, with only line level buffering
set ::settings(log_fast) 1
if {[ifexists ::settings(log_fast)] == "1"} {
msg "fast log file"
fconfigure $::logfile_handle -blocking 0 -buffering line
Expand Down Expand Up @@ -366,11 +368,11 @@ proc scheduled_app_update_check {} {
proc check_timestamp_for_app_update_available { {check_only 0} } {

set host "http://decentespresso.com"
set progname "de1stable"
set progname "de1plus"
if {[ifexists ::settings(app_updates_beta_enabled)] == 1} {
set progname "de1plus"
set progname "de1beta"
}
puts "update timestand endpoint: '$progname'"
puts "update timestanp endpoint: '$progname'"

set url_timestamp "$host/download/sync/$progname/timestamp.txt"

Expand Down Expand Up @@ -483,9 +485,9 @@ proc start_app_update {} {
set host "http://decentespresso.com"
}

set progname "de1stable"
set progname "de1plus"
if {[ifexists ::settings(app_updates_beta_enabled)] == 1} {
set progname "de1plus"
set progname "de1beta"
}

puts "update download endpoint: '$progname'"
Expand Down

0 comments on commit f433940

Please sign in to comment.