Download as
Browse Code »

Commit 15d0938b5ae062378ccd74d48c0347e35c5cd55b

Authored by Perry Werneck
1 parent 6fbd46ad
Exists in master and in 2 other branches develop, script-support

Small adjustments in the windows pack script

Showing 1 changed file with 29 additions and 8 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @15d0938
... ... @@ -38,6 +38,7 @@ TARGET_ARCHS="x86_64"
38 38 GIT_URL="https://github.com/PerryWerneck"
39 39 BUILD_UNSTABLE=0
40 40 MAKE_ZIP=0
  41 +CLEAR_TARGET_PATH=0
41 42  
42 43 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
43 44 WORKDIR=$(mktemp -d)
... ... @@ -83,7 +84,6 @@ failed()
83 84 clone()
84 85 {
85 86 echo -e "\e]2;Cloning ${1}\a"
86   - echo "Cloning ${1}"
87 87  
88 88 mkdir -p ${WORKDIR}/sources
89 89  
... ... @@ -571,7 +571,16 @@ copy_install_file() {
571 571 fi
572 572  
573 573 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
574   - mkdir -p ~/public_html/win/${TARGET_PATH}
  574 +
  575 + mkdir -p "~/public_html/win/${TARGET_PATH}"
  576 + if [ "$?" != "0" ]; then
  577 + failed "Can't create ~/public_html/win/${TARGET_PATH}"
  578 + fi
  579 +
  580 + if [ "${CLEAR_TARGET_PATH}" == "1"]; then
  581 + rm -fr "~/public_html/win/${TARGET_PATH}/*"
  582 + fi
  583 +
575 584 ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH}
576 585 if [ "$?" != "0" ]; then
577 586 failed "Can't link ${1} to ~/public_html/win/${TARGET_PATH}"
... ... @@ -585,6 +594,10 @@ copy_install_file() {
585 594 failed "Can't create ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"
586 595 fi
587 596  
  597 + if [ "${CLEAR_TARGET_PATH}" == "1"]; then
  598 + rm -fr "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}/*"
  599 + fi
  600 +
588 601 ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}
589 602 if [ "$?" != "0" ]; then
590 603 failed "Can't link ${1} to ~/${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"
... ... @@ -771,13 +784,21 @@ do
771 784 ;;
772 785  
773 786 CLEAR)
774   - if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
775   - rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}
776   - fi
  787 + CLEAR_TARGET_PATH=1
777 788  
778   - if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
779   - rm -fr ${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}/{x86_32,x86_64}
780   - fi
  789 +# if [ ${BUILD_UNSTABLE} == "1" ]; then
  790 +# CLEAR_TARGET="${PRODUCT_NAME}/unstable"
  791 +# else
  792 +# CLEAR_TARGET="${PRODUCT_NAME}/stable"
  793 +# fi
  794 +#
  795 +# if [ -d ~/public_html/win/${STORAGE_PATH} ]; then
  796 +# echo rm -fr ~/public_html/win/${CLEAR_TARGET}/{x86_32,x86_64}
  797 +# fi
  798 +#
  799 +# if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${CLEAR_TARGET}" ]; then
  800 +# echo rm -fr ${XDG_PUBLICSHARE_DIR}/${CLEAR_TARGET}/{x86_32,x86_64}
  801 +# fi
781 802  
782 803 ;;
783 804  
... ...