Commit 093f82e703f7bc542a708bf634c8729ca1898817
1 parent
6ca8c69c
Exists in
master
and in
2 other branches
Improving windows packager.
Showing
1 changed file
with
11 additions
and
7 deletions
Show diff stats
win/pack.sh
@@ -555,21 +555,25 @@ makeRuntime() | @@ -555,21 +555,25 @@ makeRuntime() | ||
555 | # | 555 | # |
556 | copy_install_file() { | 556 | copy_install_file() { |
557 | 557 | ||
558 | - FILENAME=${PROJECTDIR}/$(basename ${1}) | ||
559 | - | ||
560 | - rm -f "${FILENAME}" | ||
561 | - cp -v "${1}" "${FILENAME}" | ||
562 | - | ||
563 | if [ "$?" != "0" ]; then | 558 | if [ "$?" != "0" ]; then |
564 | failed "Can't copy ${1} to ${FILENAME}" | 559 | failed "Can't copy ${1} to ${FILENAME}" |
565 | fi | 560 | fi |
566 | 561 | ||
567 | if [ ${BUILD_UNSTABLE} == "1" ]; then | 562 | if [ ${BUILD_UNSTABLE} == "1" ]; then |
568 | TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}" | 563 | TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}" |
564 | + FILENAME=${PROJECTDIR}/dist/unstable/${ARCH}/$(basename ${1}) | ||
569 | else | 565 | else |
570 | TARGET_PATH="/${PRODUCT_NAME}/stable/${ARCH}" | 566 | TARGET_PATH="/${PRODUCT_NAME}/stable/${ARCH}" |
567 | + FILENAME=${PROJECTDIR}/dist/stable/${ARCH}/$(basename ${1}) | ||
571 | fi | 568 | fi |
572 | 569 | ||
570 | + if [ "${CLEAR_TARGET_PATH}" == "1" ]; then | ||
571 | + rm -fr "$(dirname ${FILENAME})/*" | ||
572 | + fi | ||
573 | + | ||
574 | + mkdir -p $(dirname ${FILENAME}) | ||
575 | + ln -f -v ${1} "${FILENAME}" | ||
576 | + | ||
573 | if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then | 577 | if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then |
574 | 578 | ||
575 | mkdir -p "~/public_html/win/${TARGET_PATH}" | 579 | mkdir -p "~/public_html/win/${TARGET_PATH}" |
@@ -577,7 +581,7 @@ copy_install_file() { | @@ -577,7 +581,7 @@ copy_install_file() { | ||
577 | failed "Can't create ~/public_html/win/${TARGET_PATH}" | 581 | failed "Can't create ~/public_html/win/${TARGET_PATH}" |
578 | fi | 582 | fi |
579 | 583 | ||
580 | - if [ "${CLEAR_TARGET_PATH}" == "1"]; then | 584 | + if [ "${CLEAR_TARGET_PATH}" == "1" ]; then |
581 | rm -fr "~/public_html/win/${TARGET_PATH}/*" | 585 | rm -fr "~/public_html/win/${TARGET_PATH}/*" |
582 | fi | 586 | fi |
583 | 587 | ||
@@ -594,7 +598,7 @@ copy_install_file() { | @@ -594,7 +598,7 @@ copy_install_file() { | ||
594 | failed "Can't create ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}" | 598 | failed "Can't create ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}" |
595 | fi | 599 | fi |
596 | 600 | ||
597 | - if [ "${CLEAR_TARGET_PATH}" == "1"]; then | 601 | + if [ "${CLEAR_TARGET_PATH}" == "1" ]; then |
598 | rm -fr "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}/*" | 602 | rm -fr "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}/*" |
599 | fi | 603 | fi |
600 | 604 |