Add site for network setup package

windows/scripts/setup-cygwin.bat

@@ -18,14 +18,14 @@ GOTO END
 
 :REMOTE_INSTALL
 SET PACKAGES=-P autobuild -P autoconf -P automake -P binutils -P bison -P bzip2 -P ca-certificates -P cron -P cygport -P cygrunsrv -P file -P flex -P gcc4 -P gdbm -P libgdbm-devel -P gettext -P gettext-devel -P libglib2.0-devel -P libglib2.0_0 -P libexpat1 -P libexpat1-devel -P libmpfr-devel -P libmpfr4 -P libtool -P libxml2 -P libxml2-devel -P libxslt2 -P libxslt2-devel -P make -P m4 -P libncurses-devel -P libncursesw-devel -P patch -P patchutils -P pkg-config -P python -P python-setuptools -P openssl-devel -P libopenssl098 -P libopenssl100 -P popt -P readline -P libsqlite3-devel -P libsqlite3_0 -P swig -P syslog-ng -P zlib-devel -P vim -P wget 
-SET SITEOPTIONS=
+SET SITEOPTIONS=-s http://www.netgull.com/cygwin -s http://cygwin.petsads.us
 REM ECHO %2 | FINDSTR \. > /NULL
 REM IF %ERRORLEVEL% == 0 SET SITEOPTIONS=--site %2 --only-site
-IF /I %2 NEQ network SET SITEOPTIONS=--site %2 --only-site
+IF /I %2 NEQ network SET SITEOPTIONS=-s %2 --only-site
 ECHO Install cygwin at %CYGWINROOT% from %SITE% ...
 REM setup.exe -D -X --site http://mirrors.163.com/cygwin -l D:/slapos/slapos-cygwin-packages -R D:/slapos/cygwin 
 REM           -P cygrunsrv -P binutils -P gcc4 -P libtool -P make -P autobuild -P autoconf -P automake -P libiconv
-%SETUPFILE% %PACKAGES% %SITEOPTIONS% -l %DOWNLOADPATH% -R %CYGWINROOT% %OPTIONS%
+%SETUPFILE% %PACKAGES% %SITEOPTIONS% -D -L -l %DOWNLOADPATH% -R %CYGWINROOT% %OPTIONS%
 GOTO END
 
 :END

windows/scripts/slapos.iss

@@ -75,10 +75,10 @@ Name: "{group}\SlapOS.org"; Filename: "http://www.slapos.org/";
 Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
 
 [Run]
-Filename: "{app}\setup-cygwin.bat"; Parameters: """{app}"" network"; StatusMsg: "Installing Cygwin...";
-Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/post-install.sh"; WorkingDir: "{app}\cygwin\bin"; Description: "Configure Cygwin"; StatusMsg: "Configure Cygwin...";
-Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\bin"; Description: "Builout process"; StatusMsg: "Building SlapOS...";
-Filename: "cmd.exe"; Parameters: "/c {app}\cygwin\etc\postinstall\autorebase.bat.done"; WorkingDir: "{app}\cygwin";  Flags: runhidden;
+Filename: "{app}\setup-cygwin.bat"; Parameters: """{app}"" network"; StatusMsg: "Installing Cygwin..."; Flags: runhidden;
+Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/post-install.sh"; WorkingDir: "{app}\cygwin\bin"; Description: "Configure Cygwin"; StatusMsg: "Configure Cygwin..."; Flags: skipifdoesntexist
+Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\bin"; Description: "Builout process"; StatusMsg: "Building SlapOS..."; Flags: skipifdoesntexist;
+Filename: "cmd.exe"; Parameters: "/c {app}\cygwin\etc\postinstall\autorebase.bat.done"; WorkingDir: "{app}\cygwin";  Flags: skipifdoesntexist runhidden;
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\cygwin" ;