Patch for command line install/download in setup.exe

Patch for command line install/download in setup.exe

[Ralph Hempel]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Some time ago, I mentioned on this list that the -D -L options
for setup.exe don't operate quite the same as the radio buttons
on the setup dialog.

The operation I ended up describing was:

1. last-action should be consulted only if _neither_ -D nor -L are given
2. if -D is given, then download to local directory only
3. if -L is given, then install from local directory only
4. if both -D and -L are given, download and install

The attached patch to source.cc (HEAD) accomplishes this with
an absolute minimum set of changes. I have tested this patch using the
following command lines:

setup -L    -> sets the radio button for a local install
setup -D    -> sets the radio button for download only
setup -D -L -> sets the radio button for download and install
setup       -> sets the radio button to the previous(default) state

Please consider adding this to the current setup.exe source.

Cheers, Ralph

[-- Attachment #2: downloadinstall.diff --]
[-- Type: text/x-diff, Size: 385 bytes --]

--- setup/source.cc	2008-09-03 09:29:28.593750000 -0400
+++ setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
@@ -86,9 +86,7 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption && LocalOption)
-    source = IDC_SOURCE_NETINST;
-  else if (DownloadOption)
+  if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;

Re: Patch for command line install/download in setup.exe

[Ralph Hempel]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

Ugh, bad form replying to my own email but the patch I submitted
works in thewrong direction. Here's the correct patch...

Sorry for the noise.

Ralph

[-- Attachment #2: downloadinstall.diff --]
[-- Type: text/x-diff, Size: 385 bytes --]

--- setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
+++ setup/source.cc	2008-09-03 09:29:28.593750000 -0400
@@ -86,7 +86,9 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption)
+  if (DownloadOption && LocalOption)
+    source = IDC_SOURCE_NETINST;
+  else if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;

Re: Patch for command line install/download in setup.exe

[Ralph Hempel]

[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]

Sorry for resubmitting this, but I got no response from the setup
maintainer(s) and wanted to be sure it does not fall between the
cracks before the next release... I'm sure everyone is very busy.

Some time ago, I mentioned on this list that the -D -L command
line options for setup.exe don't operate quite the same as the
radio buttons on the setup dialog.

The operation I ended up describing was:

1. last-action should be consulted only if _neither_ -D nor -L are given
2. if -D is given, then download to local directory only
3. if -L is given, then install from local directory only
4. if both -D and -L are given, download and install

The attached patch to source.cc (HEAD) accomplishes this with
an absolute minimum set of changes. I have tested this patch using the
following command lines:

setup -L    -> sets the radio button for a local install
setup -D    -> sets the radio button for download only
setup -D -L -> sets the radio button for download and install
setup       -> sets the radio button to the previous(default) state

Please consider adding this to the current setup.exe source.

Cheers, Ralph





[-- Attachment #2: downloadinstall.diff --]
[-- Type: text/x-diff, Size: 386 bytes --]

--- setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
+++ setup/source.cc	2008-09-03 09:29:28.593750000 -0400
@@ -86,7 +86,9 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption)
+  if (DownloadOption && LocalOption)
+    source = IDC_SOURCE_NETINST;
+  else if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;

[PATCH] Setup 1.7 command line install/download in setup.exe

[Ralph Hempel]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

Some time ago, I mentioned on this list that the -D -L command
line options for setup.exe (1.7) don't operate quite the same as the
radio buttons on the setup dialog.

The operation I ended up describing was:

1. last-action should be consulted only if _neither_ -D nor -L are given
2. if -D is given, then download to local directory only
3. if -L is given, then install from local directory only
4. if both -D and -L are given, download and install

The attached patch to source.cc (HEAD) accomplishes this with
an absolute minimum set of changes. I have tested this patch using the
following command lines:

setup -L    -> sets the radio button for a local install
setup -D    -> sets the radio button for download only
setup -D -L -> sets the radio button for download and install
setup       -> sets the radio button to the previous(default) state

Please consider adding this to the current setup.exe source.

Cheers, Ralph






[-- Attachment #2: downloadinstall.diff --]
[-- Type: text/x-diff, Size: 387 bytes --]

--- setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
+++ setup/source.cc	2008-09-03 09:29:28.593750000 -0400
@@ -86,7 +86,9 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption)
+  if (DownloadOption && LocalOption)
+    source = IDC_SOURCE_NETINST;
+  else if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Corinna Vinschen]

On Dec  5 11:24, Ralph Hempel wrote:
> Some time ago, I mentioned on this list that the -D -L command
> line options for setup.exe (1.7) don't operate quite the same as the
> radio buttons on the setup dialog.
> [...]

The patch misses a ChangeLog entry...


Corinna


-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Ralph Hempel]

Corinna Vinschen wrote:
> On Dec  5 11:24, Ralph Hempel wrote:
>> Some time ago, I mentioned on this list that the -D -L command
>> line options for setup.exe (1.7) don't operate quite the same as the
>> radio buttons on the setup dialog.
>> [...]
> 
> The patch misses a ChangeLog entry...

I'll add that and resubmit when I get back from my current
field visit...thanks.

Ralph

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Ralph Hempel]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

Corinna Vinschen wrote:
> On Dec  5 11:24, Ralph Hempel wrote:
>> Some time ago, I mentioned on this list that the -D -L command
>> line options for setup.exe (1.7) don't operate quite the same as the
>> radio buttons on the setup dialog.
>> [...]
> 
> The patch misses a ChangeLog entry...

OK, here's the patch and the changelog...

Ralph

[-- Attachment #2: setup-downloadinstall.changelog --]
[-- Type: text/plain, Size: 91 bytes --]

2008-09-03  Ralph Hempel

	* source.cc: Add support for both -D and -L on command line
	

[-- Attachment #3: setup-downloadinstall.diff --]
[-- Type: text/x-diff, Size: 385 bytes --]

--- setup-clean/source.cc	2008-08-12 16:32:08.000000000 -0400
+++ setup/source.cc	2008-09-03 09:29:28.593750000 -0400
@@ -86,7 +86,9 @@
 void
 SourcePage::OnActivate ()
 {
-  if (DownloadOption)
+  if (DownloadOption && LocalOption)
+    source = IDC_SOURCE_NETINST;
+  else if (DownloadOption)
     source = IDC_SOURCE_DOWNLOAD;
   else if (LocalOption)
     source = IDC_SOURCE_CWD;

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Christopher Faylor]

On Wed, Dec 10, 2008 at 08:48:18PM -0500, Ralph Hempel wrote:
> OK, here's the patch and the changelog...
>

>2008-09-03  Ralph Hempel
>
>	* source.cc: Add support for both -D and -L on command line

Applied.

cgf

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Christopher Faylor]

On Wed, Dec 10, 2008 at 09:54:55PM -0500, Christopher Faylor wrote:
>On Wed, Dec 10, 2008 at 08:48:18PM -0500, Ralph Hempel wrote:
>> OK, here's the patch and the changelog...
>>
>
>>2008-09-03  Ralph Hempel
>>
>>	* source.cc: Add support for both -D and -L on command line
>
>Applied.

...and Thanks!

cgf

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Ralph Hempel]

Christopher Faylor wrote:
> On Wed, Dec 10, 2008 at 09:54:55PM -0500, Christopher Faylor wrote:
>> On Wed, Dec 10, 2008 at 08:48:18PM -0500, Ralph Hempel wrote:
>>> OK, here's the patch and the changelog...
>>>
>>> 2008-09-03  Ralph Hempel
>>>
>>> 	* source.cc: Add support for both -D and -L on command line
>> Applied.
> 
> ...and Thanks!

You're welcome! And thanks for everyone's patience as I learned
the ropes in terms of contributing.

Cheers, Ralph

Re: [PATCH] Setup 1.7 command line install/download in setup.exe

[Christopher Faylor]

On Thu, Dec 11, 2008 at 03:24:40AM -0500, Ralph Hempel wrote:
>Christopher Faylor wrote:
>>On Wed, Dec 10, 2008 at 09:54:55PM -0500, Christopher Faylor wrote:
>>>On Wed, Dec 10, 2008 at 08:48:18PM -0500, Ralph Hempel wrote:
>>>>OK, here's the patch and the changelog...
>>>>
>>>>2008-09-03 Ralph Hempel
>>>>
>>>>* source.cc: Add support for both -D and -L on command line
>>>Applied.
>>...and Thanks!
>
>You're welcome! And thanks for everyone's patience as I learned the
>ropes in terms of contributing.

I know that the learning curve is (maybe too) steep so you are among the
select few who have persevered and won through.

On the upside, now that you've learned, we're expecting, if not
demanding, a lot more improvements from you.

We'll be expecting your next setup.exe change on Tuesday, December 16.
Please start working on your improvement ASAP.

cgf

Oh, ok:  :-)