@@ -118,63 +118,59 @@ sub getDeps {
118
118
# Create postinstall.bat
119
119
#
120
120
121
- unless (-f " ../Installer-Files/postinstall.bat" ) {
122
- open F, " >../Installer-Files/postinstall.bat" ;
123
-
124
- print F " \@ echo off\r\n " ;
125
- print F " del postinstall.log>>postinstall.log\r\n " ;
126
- print F " echo OSGEO4W_ROOT=%OSGEO4W_ROOT %>>postinstall.log 2>&1\r\n " ;
127
- print F " echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU %>>postinstall.log 2>&1\r\n " ;
128
- print F " set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT :\\ =/%\r\n " ;
129
- print F " if \" %OSGEO4W_ROOT_MSYS :~1,1%\" ==\" :\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS :~0,1%/%OSGEO4W_ROOT_MSYS :~3%\r\n " ;
130
- print F " echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS %>>postinstall.log 2>&1\r\n " ;
131
- print F " PATH %OSGEO4W_ROOT %\\ bin;%PATH %>>postinstall.log 2>&1\r\n " ;
132
- print F " cd %OSGEO4W_ROOT %>>postinstall.log 2>&1\r\n " ;
133
-
134
- chdir " unpacked" ;
135
- for my $p (<etc/postinstall/*.bat>) {
136
- $p =~ s /\/ / \\ / g ;
137
- my ($dir ,$file ) = $p =~ / ^(.+)\\ ([^\\ ]+)$ / ;
138
-
139
- print F " echo Running postinstall $file ...\r\n " ;
140
- print F " %COMSPEC % /c $p >>postinstall.log 2>&1\r\n " ;
141
- print F " ren $p $file .done>>postinstall.log 2>&1\r\n " ;
142
- }
143
- chdir " .." ;
144
-
145
- print F " ren postinstall.bat postinstall.bat.done\r\n " ;
146
-
147
- close F;
121
+ open F, " >../Installer-Files/postinstall.bat" ;
122
+
123
+ print F " \@ echo off\r\n " ;
124
+ print F " del postinstall.log>>postinstall.log\r\n " ;
125
+ print F " echo OSGEO4W_ROOT=%OSGEO4W_ROOT %>>postinstall.log 2>&1\r\n " ;
126
+ print F " echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU %>>postinstall.log 2>&1\r\n " ;
127
+ print F " set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT :\\ =/%\r\n " ;
128
+ print F " if \" %OSGEO4W_ROOT_MSYS :~1,1%\" ==\" :\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS :~0,1%/%OSGEO4W_ROOT_MSYS :~3%\r\n " ;
129
+ print F " echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS %>>postinstall.log 2>&1\r\n " ;
130
+ print F " PATH %OSGEO4W_ROOT %\\ bin;%PATH %>>postinstall.log 2>&1\r\n " ;
131
+ print F " cd %OSGEO4W_ROOT %>>postinstall.log 2>&1\r\n " ;
132
+
133
+ chdir " unpacked" ;
134
+ for my $p (<etc/postinstall/*.bat>) {
135
+ $p =~ s /\/ / \\ / g ;
136
+ my ($dir ,$file ) = $p =~ / ^(.+)\\ ([^\\ ]+)$ / ;
137
+
138
+ print F " echo Running postinstall $file ...\r\n " ;
139
+ print F " %COMSPEC % /c $p >>postinstall.log 2>&1\r\n " ;
140
+ print F " ren $p $file .done>>postinstall.log 2>&1\r\n " ;
148
141
}
142
+ chdir " .." ;
149
143
150
- unless (-f " ../Installer-Files/preremove.bat" ) {
151
- open F, " >../Installer-Files/preremove.bat" ;
152
-
153
- print F " \@ echo off\r\n " ;
154
- print F " del preremove.log>>preremove.log\r\n " ;
155
- print F " echo OSGEO4W_ROOT=%OSGEO4W_ROOT %>>preremove.log 2>&1\r\n " ;
156
- print F " echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU %>>preremove.log 2>&1\r\n " ;
157
- print F " set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT :\\ =/%\r\n " ;
158
- print F " if \" %OSGEO4W_ROOT_MSYS :~1,1%\" ==\" :\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS :~0,1%/%OSGEO4W_ROOT_MSYS :~3%\r\n " ;
159
- print F " echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS %>>preremove.log 2>&1\r\n " ;
160
- print F " PATH %OSGEO4W_ROOT %\\ bin;%PATH %>>preremove.log 2>&1\r\n " ;
161
- print F " cd %OSGEO4W_ROOT %>>preremove.log 2>&1\r\n " ;
144
+ print F " ren postinstall.bat postinstall.bat.done\r\n " ;
162
145
163
- chdir " unpacked" ;
164
- for my $p (<etc/preremove/*.bat>) {
165
- $p =~ s /\/ / \\ / g ;
166
- my ($dir ,$file ) = $p =~ / ^(.+)\\ ([^\\ ]+)$ / ;
146
+ close F;
167
147
168
- print F " echo Running preremove $file ...\r\n " ;
169
- print F " %COMSPEC % /c $p >>preremove.log 2>&1\r\n " ;
170
- print F " ren $p $file .done>>preremove.log 2>&1\r\n " ;
171
- }
172
- chdir " .." ;
148
+ open F, " >../Installer-Files/preremove.bat" ;
149
+
150
+ print F " \@ echo off\r\n " ;
151
+ print F " del preremove.log>>preremove.log\r\n " ;
152
+ print F " echo OSGEO4W_ROOT=%OSGEO4W_ROOT %>>preremove.log 2>&1\r\n " ;
153
+ print F " echo OSGEO4W_STARTMENU=%OSGEO4W_STARTMENU %>>preremove.log 2>&1\r\n " ;
154
+ print F " set OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT :\\ =/%\r\n " ;
155
+ print F " if \" %OSGEO4W_ROOT_MSYS :~1,1%\" ==\" :\" set OSGEO4W_ROOT_MSYS=/%OSGEO4W_ROOT_MSYS :~0,1%/%OSGEO4W_ROOT_MSYS :~3%\r\n " ;
156
+ print F " echo OSGEO4W_ROOT_MSYS=%OSGEO4W_ROOT_MSYS %>>preremove.log 2>&1\r\n " ;
157
+ print F " PATH %OSGEO4W_ROOT %\\ bin;%PATH %>>preremove.log 2>&1\r\n " ;
158
+ print F " cd %OSGEO4W_ROOT %>>preremove.log 2>&1\r\n " ;
159
+
160
+ chdir " unpacked" ;
161
+ for my $p (<etc/preremove/*.bat>) {
162
+ $p =~ s /\/ / \\ / g ;
163
+ my ($dir ,$file ) = $p =~ / ^(.+)\\ ([^\\ ]+)$ / ;
164
+
165
+ print F " echo Running preremove $file ...\r\n " ;
166
+ print F " %COMSPEC % /c $p >>preremove.log 2>&1\r\n " ;
167
+ print F " ren $p $file .done>>preremove.log 2>&1\r\n " ;
168
+ }
169
+ chdir " .." ;
173
170
174
- print F " ren preremove.bat preremove.bat.done\r\n " ;
171
+ print F " ren preremove.bat preremove.bat.done\r\n " ;
175
172
176
- close F;
177
- }
173
+ close F;
178
174
179
175
my ($major , $minor , $patch , $release , $revision );
180
176
0 commit comments