Commit e7f0051467c248beb0de7f12cc7868fd3753fc3c
1 parent
98370e68
Exists in
master
and in
4 other branches
Adjusting windows pack script to isolate clone & prepare methods.
Showing
1 changed file
with
15 additions
and
3 deletions
Show diff stats
win/pack.sh
... | ... | @@ -67,13 +67,14 @@ failed() |
67 | 67 | exit -1 |
68 | 68 | } |
69 | 69 | |
70 | + | |
70 | 71 | # |
71 | 72 | # Get Sources from GIT |
72 | 73 | # |
73 | -prepare() | |
74 | +clone() | |
74 | 75 | { |
75 | - echo -e "\e]2;Preparing ${1}\a" | |
76 | - echo "Preparing ${1}" | |
76 | + echo -e "\e]2;Cloning ${1}\a" | |
77 | + echo "Cloning ${1}" | |
77 | 78 | |
78 | 79 | mkdir -p ${WORKDIR}/sources |
79 | 80 | |
... | ... | @@ -86,6 +87,13 @@ prepare() |
86 | 87 | git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} |
87 | 88 | fi |
88 | 89 | |
90 | +} | |
91 | + | |
92 | +prepare() | |
93 | +{ | |
94 | + echo -e "\e]2;Preparing ${1}\a" | |
95 | + echo "Preparing ${1}" | |
96 | + | |
89 | 97 | if [ "$?" != "0" ]; then |
90 | 98 | failed "Can't get sources for ${1}" |
91 | 99 | fi |
... | ... | @@ -755,18 +763,22 @@ fi |
755 | 763 | # |
756 | 764 | for src in ${CORE_LIBRARIES} |
757 | 765 | do |
766 | + clone ${src} | |
758 | 767 | prepare ${src} |
759 | 768 | done |
760 | 769 | |
770 | +clone ${src} | |
761 | 771 | prepare pw3270 |
762 | 772 | |
763 | 773 | for src in ${PACKAGE_PLUGINS} |
764 | 774 | do |
775 | + clone pw3270-plugin-${src} | |
765 | 776 | prepare pw3270-plugin-${src} |
766 | 777 | done |
767 | 778 | |
768 | 779 | for src in ${PACKAGE_EXTRAS} |
769 | 780 | do |
781 | + clone ${src} | |
770 | 782 | prepare ${src} |
771 | 783 | done |
772 | 784 | ... | ... |