Download as
Browse Code »

Commit 9b27a2a6ae4b9744287f03e1e59e729a1432e8cc

Authored by Perry Werneck
2 parents 11c1f741 1b20eddc
Exists in master and in 2 other branches develop, script-support

Merge branch 'develop' of https://github.com/PerryWerneck/pw3270 into develop

Showing 3 changed files with 10 additions and 10 deletions   Show diff stats
@@ -58,7 +58,6 @@ For the supported distributions get the install repositories and instructions fr @@ -58,7 +58,6 @@ For the supported distributions get the install repositories and instructions fr
58 ```shell 58 ```shell
59 $ pacman -S mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape 59 $ pacman -S mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape
60 ``` 60 ```
61 - Afther thist close and reopen mingw shell.  
62 61
63 2. Get pw3270 sources from git 62 2. Get pw3270 sources from git
64 63
@@ -589,9 +589,6 @@ copy_install_file() { @@ -589,9 +589,6 @@ copy_install_file() {
589 fi 589 fi
590 590
591 ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH} 591 ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH}
592 - if [ "$?" != "0" ]; then  
593 - failed "Can't link ${1} to ~/public_html/win/${TARGET_PATH}"  
594 - fi  
595 fi 592 fi
596 593
597 if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then 594 if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
@@ -606,17 +603,16 @@ copy_install_file() { @@ -606,17 +603,16 @@ copy_install_file() {
606 fi 603 fi
607 604
608 ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH} 605 ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}
609 - if [ "$?" != "0" ]; then  
610 - failed "Can't link ${1} to ~/${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"  
611 - fi  
612 606
613 fi 607 fi
614 608
615 - if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then 609 + if [ "${PUBLISH}" == "1" ] && [ ! -z "${WIN_PACKAGE_SERVER}" ]; then
616 610
617 - scp "${FILENAME}" ${WIN_PACKAGE_SERVER}/${TARGET_PATH} 611 + scp "${FILENAME}" "${WIN_PACKAGE_SERVER}/${TARGET_PATH}/$(basename ${FILENAME})"
618 if [ "$?" != "0" ]; then 612 if [ "$?" != "0" ]; then
619 - failed "Can't publish ${1} to ${WIN_PACKAGE_SERVER}/${TARGET_PATH}" 613 + failed "Can't publish ${WIN_PACKAGE_SERVER}/${TARGET_PATH}/$(basename ${FILENAME})"
  614 + else
  615 + echo "Published to ${WIN_PACKAGE_SERVER}/${TARGET_PATH}/$(basename ${FILENAME})"
620 fi 616 fi
621 617
622 fi 618 fi
win/pw3270.nsi.in
  Diff comments   View file @9b27a2a
@@ -137,6 +137,11 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -137,6 +137,11 @@ SubSection "@PRODUCT_NAME@" SecMain
137 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" 137 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"
138 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo" 138 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo"
139 139
  140 + # Customized icons
  141 + CreateDirectory "$INSTDIR\icons"
  142 + file "/oname=$INSTDIR\icons\gtk-connect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-connect-symbolic.svg"
  143 + file "/oname=$INSTDIR\icons\gtk-disconnect-symbolic.svg" "share\@PRODUCT_NAME@\icons\gtk-disconnect-symbolic.svg"
  144 +
140 # define uninstaller name 145 # define uninstaller name
141 SetRegView 32 146 SetRegView 32
142 147