Commit ea50cccaee8b0146822d03404b85508cafdae813
1 parent
f94a8997
Exists in
master
and in
2 other branches
Fixing scp based windows publish.
Showing
1 changed file
with
5 additions
and
9 deletions
Show diff stats
win/pack.sh
... | ... | @@ -589,9 +589,6 @@ copy_install_file() { |
589 | 589 | fi |
590 | 590 | |
591 | 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 | 592 | fi |
596 | 593 | |
597 | 594 | if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then |
... | ... | @@ -606,17 +603,16 @@ copy_install_file() { |
606 | 603 | fi |
607 | 604 | |
608 | 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 | 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 | 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 | 616 | fi |
621 | 617 | |
622 | 618 | fi | ... | ... |