Skip to content

Commit

Permalink
* ecosadmin.tcl (ecosadmin::process_add_package): Use gzip -d, not
Browse files Browse the repository at this point in the history
	gunzip, as the latter fails with TCL on cygwin.
  • Loading branch information
jlarmour committed Oct 24, 2002
1 parent be033f9 commit 87a6bba
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions packages/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2002-10-24 Jonathan Larmour <[email protected]>

* ecosadmin.tcl (ecosadmin::process_add_package): Use gzip -d, not
gunzip, as the latter fails with TCL on cygwin.

2002-10-18 Gary Thomas <[email protected]>

* ecos.db: Change package name for TS1000 flash part (consistency).
Expand Down
10 changes: 5 additions & 5 deletions packages/ecosadmin.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ proc ecosadmin::filter_old_packages { old_packages } {

# ----------------------------------------------------------------------------
# Process_add_packages. This routine is responsible for installing packages
# into the eCos repository using the gunzip and tar tools which must be on
# into the eCos repository using the gzip and tar tools which must be on
# the path
#

Expand All @@ -1095,12 +1095,12 @@ proc ecosadmin::process_add_package { } {
if { $ecosadmin::extract_license_arg == 1 } {
# extract the license file (if any) from the specified gzipped tar archive
file delete $licensefile
catch { exec > $ecosadmin::null_device gunzip < $abs_package | tar xf - $licensefile }
catch { exec > $ecosadmin::null_device gzip -d < $abs_package | tar xf - $licensefile }
return
}

# extract the package data file from the specified gzipped tar archive
if { [ catch { exec > $ecosadmin::null_device gunzip < $abs_package | tar xf - $datafile } message ] != 0 } {
if { [ catch { exec > $ecosadmin::null_device gzip -d < $abs_package | tar xf - $datafile } message ] != 0 } {
fatal_error "extracting $datafile:\n$message"
}

Expand All @@ -1112,7 +1112,7 @@ proc ecosadmin::process_add_package { } {
}

# extract the remaining package contents and generate a list of extracted files
if { [ catch { exec gunzip < $abs_package | tar xvf - > $logfile } message ] != 0 } {
if { [ catch { exec gzip -d < $abs_package | tar xvf - > $logfile } message ] != 0 } {
file delete $logfile
fatal_error "extracting files:\n$message"
}
Expand Down Expand Up @@ -1202,7 +1202,7 @@ proc ecosadmin::accept_license { archivename filename } {
}

# extract the specified license file from the specified gzipped tar archive
if { [ catch { exec > $ecosadmin::null_device gunzip < $archivename | tar xf - $filename } message ] != 0 } {
if { [ catch { exec > $ecosadmin::null_device gzip -d < $archivename | tar xf - $filename } message ] != 0 } {
# no license file
return "y"
}
Expand Down

0 comments on commit 87a6bba

Please sign in to comment.