Commit b570aa0e6dd904b7ee63a46f2d434013ee8229d8
1 parent
8588a4c0
Exists in
master
and in
2 other branches
Updating win package
Showing
1 changed file
with
5 additions
and
19 deletions
Show diff stats
win/pack.sh
... | ... | @@ -614,32 +614,18 @@ copy_install_file() { |
614 | 614 | cp -v "${1}" "${FILENAME}" |
615 | 615 | fi |
616 | 616 | |
617 | - if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then | |
617 | + if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/win/${PRODUCT_NAME}" ]; then | |
618 | 618 | |
619 | - mkdir -p "~/public_html/win/${TARGET_PATH}" | |
619 | + mkdir -p "${XDG_PUBLICSHARE_DIR}/win/${TARGET_PATH}" | |
620 | 620 | if [ "$?" != "0" ]; then |
621 | - failed "Can't create ~/public_html/win/${TARGET_PATH}" | |
621 | + failed "Can't create ${XDG_PUBLICSHARE_DIR}/win/${TARGET_PATH}" | |
622 | 622 | fi |
623 | 623 | |
624 | 624 | if [ "${CLEAR_TARGET_PATH}" == "1" ]; then |
625 | - rm -fr ~/public_html/win/${TARGET_PATH}/* | |
625 | + rm -fr ${XDG_PUBLICSHARE_DIR}/win/${TARGET_PATH}/* | |
626 | 626 | fi |
627 | 627 | |
628 | - ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH} | |
629 | - fi | |
630 | - | |
631 | - if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then | |
632 | - | |
633 | - mkdir -p "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}" | |
634 | - if [ "$?" != "0" ]; then | |
635 | - failed "Can't create ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}" | |
636 | - fi | |
637 | - | |
638 | - if [ "${CLEAR_TARGET_PATH}" == "1" ]; then | |
639 | - rm -fr ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}/* | |
640 | - fi | |
641 | - | |
642 | - ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH} | |
628 | + ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/win/${TARGET_PATH} | |
643 | 629 | |
644 | 630 | fi |
645 | 631 | ... | ... |