Download as
Browse Code »

Commit 4deb0403867bff6747a05cc62672e69a7a10e407

Authored by Perry Werneck
1 parent 83a0fbc0
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Fixing windows installer default options.

Showing 2 changed files with 23 additions and 16 deletions   Show diff stats
@@ -561,7 +561,7 @@ copy_install_file() { @@ -561,7 +561,7 @@ copy_install_file() {
561 TARGET_PATH="/${PRODUCT_NAME}/stable/${ARCH}" 561 TARGET_PATH="/${PRODUCT_NAME}/stable/${ARCH}"
562 fi 562 fi
563 563
564 - if [ -d ~/public_html ]; then 564 + if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
565 mkdir -p ~/public_html/win/${TARGET_PATH} 565 mkdir -p ~/public_html/win/${TARGET_PATH}
566 ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH} 566 ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH}
567 if [ "$?" != "0" ]; then 567 if [ "$?" != "0" ]; then
@@ -569,7 +569,7 @@ copy_install_file() { @@ -569,7 +569,7 @@ copy_install_file() {
569 fi 569 fi
570 fi 570 fi
571 571
572 - if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}" ]; then 572 + if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
573 573
574 mkdir -p "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}" 574 mkdir -p "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"
575 if [ "$?" != "0" ]; then 575 if [ "$?" != "0" ]; then
@@ -766,6 +766,10 @@ do @@ -766,6 +766,10 @@ do
766 rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64} 766 rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}
767 fi 767 fi
768 768
  769 + if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
  770 + rm -fr ${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}/{x86_32,x86_64}
  771 + fi
  772 +
769 ;; 773 ;;
770 774
771 EXTRA-PACKAGES) 775 EXTRA-PACKAGES)
@@ -846,7 +850,7 @@ do @@ -846,7 +850,7 @@ do
846 fi 850 fi
847 851
848 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then 852 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
849 - echo " --clear Replace the contents of ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}" 853 + echo " --clear Replace the contents of public folders"
850 fi 854 fi
851 855
852 echo "" 856 echo ""
win/pw3270.nsi.in
  Diff comments   View file @4deb040
@@ -212,7 +212,7 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -212,7 +212,7 @@ SubSection "@PRODUCT_NAME@" SecMain
212 212
213 SubSection "Plugins" SecPLugin 213 SubSection "Plugins" SecPLugin
214 214
215 - Section /o "Remote control" IPCPlugin 215 + Section "Remote control" IPCPlugin
216 216
217 setOutPath $INSTDIR 217 setOutPath $INSTDIR
218 218
@@ -235,7 +235,7 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -235,7 +235,7 @@ SubSection "@PRODUCT_NAME@" SecMain
235 SubSection "Extra modules" Languages 235 SubSection "Extra modules" Languages
236 236
237 !ifdef WITHLIBHLLAPI 237 !ifdef WITHLIBHLLAPI
238 - Section /o "HLLAPI" HLLAPIBinding 238 + Section "HLLAPI" HLLAPIBinding
239 239
240 ${@NSISREDIR@} 240 ${@NSISREDIR@}
241 241
@@ -309,7 +309,7 @@ SubSectionEnd @@ -309,7 +309,7 @@ SubSectionEnd
309 309
310 310
311 !ifdef WITHGTK 311 !ifdef WITHGTK
312 -Section /o "GTK+ Runtime" SecGTK 312 +Section "GTK+ Runtime" SecGTK
313 313
314 setOutPath $INSTDIR 314 setOutPath $INSTDIR
315 file /r "runtime\*.*" 315 file /r "runtime\*.*"
@@ -387,16 +387,16 @@ Function .onInit @@ -387,16 +387,16 @@ Function .onInit
387 ClearErrors 387 ClearErrors
388 ${GetOptions} $R0 /SDK= $0 388 ${GetOptions} $R0 /SDK= $0
389 389
390 - ${if} $0 == "NO" 390 + ${if} $0 == "YES"
391 391
392 SectionGetFlags ${SDK} $0 392 SectionGetFlags ${SDK} $0
393 - IntOp $0 $0 & ${SECTION_OFF} 393 + IntOp $0 $0 | ${SF_SELECTED}
394 SectionSetFlags ${SDK} $0 394 SectionSetFlags ${SDK} $0
395 395
396 ${else} 396 ${else}
397 397
398 SectionGetFlags ${SDK} $0 398 SectionGetFlags ${SDK} $0
399 - IntOp $0 $0 | ${SF_SELECTED} 399 + IntOp $0 $0 & ${SECTION_OFF}
400 SectionSetFlags ${SDK} $0 400 SectionSetFlags ${SDK} $0
401 401
402 ${EndIf} 402 ${EndIf}
@@ -413,13 +413,8 @@ Function .onInit @@ -413,13 +413,8 @@ Function .onInit
413 ClearErrors 413 ClearErrors
414 ${GetOptions} $R0 /DOTNET= $0 414 ${GetOptions} $R0 /DOTNET= $0
415 415
416 - ${if} $0 == "NO"  
417 -  
418 - SectionGetFlags ${DOTNET} $0  
419 - IntOp $0 $0 & ${SECTION_OFF}  
420 - SectionSetFlags ${DOTNET} $0  
421 -  
422 - ${else} 416 + # Default = NO
  417 + ${if} $0 == "YES"
423 418
424 SectionGetFlags ${DOTNET} $0 419 SectionGetFlags ${DOTNET} $0
425 IntOp $0 $0 | ${SF_SELECTED} 420 IntOp $0 $0 | ${SF_SELECTED}
@@ -429,6 +424,12 @@ Function .onInit @@ -429,6 +424,12 @@ Function .onInit
429 IntOp $0 $0 | ${SF_SELECTED} 424 IntOp $0 $0 | ${SF_SELECTED}
430 SectionSetFlags ${IPCPlugin} $0 425 SectionSetFlags ${IPCPlugin} $0
431 426
  427 + ${else}
  428 +
  429 + SectionGetFlags ${DOTNET} $0
  430 + IntOp $0 $0 & ${SECTION_OFF}
  431 + SectionSetFlags ${DOTNET} $0
  432 +
432 ${EndIf} 433 ${EndIf}
433 434
434 Pop $0 435 Pop $0
@@ -444,6 +445,7 @@ Function .onInit @@ -444,6 +445,7 @@ Function .onInit
444 ClearErrors 445 ClearErrors
445 ${GetOptions} $R0 /HLLAPI= $0 446 ${GetOptions} $R0 /HLLAPI= $0
446 447
  448 + # Default = YES
447 ${if} $0 == "NO" 449 ${if} $0 == "NO"
448 450
449 SectionGetFlags ${HLLAPIBinding} $0 451 SectionGetFlags ${HLLAPIBinding} $0
@@ -460,6 +462,7 @@ Function .onInit @@ -460,6 +462,7 @@ Function .onInit
460 IntOp $0 $0 | ${SF_SELECTED} 462 IntOp $0 $0 | ${SF_SELECTED}
461 SectionSetFlags ${IPCPlugin} $0 463 SectionSetFlags ${IPCPlugin} $0
462 464
  465 +
463 ${EndIf} 466 ${EndIf}
464 467
465 Pop $0 468 Pop $0