ecommun / shell

Download as
Browse Code ยป

Commit c90f9c27077843d27d1f859e33d748ada3604dd7

Authored by mj
1 parent 4754c5adbb
Exists in master

[IMP] repos.sh

Showing 1 changed file with 29 additions and 20 deletions Side-by-side Diff

... ... @@ -42,10 +42,10 @@ fi
42 42 if [ "$ACTION" != "" ]; then
43 43 exit 0
44 44 else
45   - printf "...................................................START..................................................."
  45 + printf "...................................................START...................................................\n"
46 46 if [ "$DEF_REPO" ]; then
47 47 if [ "$DEF_REPO" != "XX" ]; then
48   - printf "set var 'ADD_ADDON_REPOS'"
  48 + printf "set var 'ADD_ADDON_REPOS'\n"
49 49 ADD_ADDON_REPOS=("$DEF_REPO")
50 50 fi
51 51 fi
... ... @@ -71,8 +71,11 @@ else
71 71 # ADDED_REPOS=":'\n"
72 72 ADDED_REPOS=""
73 73 NOT_ADDED_REPOS=""
  74 +
  75 + MAIN_BRANCH=${REMOTE_BRANCH}
  76 +
74 77 for i in "${ADD_ADDON_REPOS[@]}"; do
75   - printf "repo '$i'"
  78 + printf "repo '$i'\n"
76 79  
77 80 # Defaults
78 81 CREATE_LINKS=1
... ... @@ -91,7 +94,7 @@ else
91 94 i=${j[0]}
92 95 REMOTE_BRANCH=${j[1]}
93 96 fi
94   - printf "using branch $REMOTE_BRANCH"
  97 + printf "~~~~~~~~~~~~ USING BRANCH: $REMOTE_BRANCH ~~~~~~~~~~~~\n"
95 98  
96 99 REPO=${i} && REPL="--" && REMOTE=${REPO/\//$REPL}
97 100 if [ "$UPDATE" = "1" ]; then
... ... @@ -99,14 +102,14 @@ else
99 102 SUBTREE_CMD="pull"
100 103 git subtree ${SUBTREE_CMD} --prefix=${PATH_PREFIX}/${REPO} remote--${REMOTE} ${REMOTE_BRANCH} --squash -q
101 104  
102   - while read line; do
103   - if [[ ${REPO} == ${line} ]]; then
104   - printf "++++++ MATCH ++++++"
105   - CREATE_LINKS=0
106   - fi
107   - printf "+++++ NOMATCH +++++"
108   - printf ${REPO}
109   - done < ignore.txt
  105 +# while read line; do
  106 +# if [[ ${REPO} == ${line} ]]; then
  107 +# printf "++++++ MATCH ++++++\n"
  108 +# CREATE_LINKS=0
  109 +# fi
  110 +# printf "+++++ NOMATCH +++++ ${REPO} \n"
  111 +# #printf ${REPO}
  112 +# done < ignore.txt
110 113  
111 114 elif [ "$ADD_REMOTE" = "YES" ]; then
112 115 git remote add -f --no-tags remote--${REMOTE} https://github.com/${REPO}.git
... ... @@ -123,29 +126,29 @@ else
123 126 n=${j##*/}
124 127 if [ $n != "__unported__" ]; then
125 128 if [ -h ${SYMLINKS_PATH}/$n ]; then
126   - printf "symlink exists '${REPO}/$n'"
  129 + printf "symlink exists '${REPO}/$n'\n"
127 130 if [ "$ADD_REMOTE" = "YES" ]; then
128   - NOT_ADDED_REPOS="$NOT_ADDED_REPOS\n${REPO}/$n\n"
  131 + NOT_ADDED_REPOS="$NOT_ADDED_REPOS\n${REPO}/$n"
129 132 fi
130 133 else
131   - printf "create symlink 1: '${REPO}/$n'"
  134 + printf "create symlink 1: '${REPO}/$n'\n"
132 135 ln -s "../../${PATH_PREFIX}/${REPO}/$n" "${SYMLINKS_PATH}/$n"
133 136 fi
134 137 if [ -h ${ADHOC_PATH}/$n ]; then
135   - printf "delete adhoc"
  138 + printf "delete adhoc\n"
136 139 rm ${ADHOC_PATH}/$n
137 140 fi
138 141 fi
139 142 fi
140 143 done
141 144 elif [ "$CREATE_LINKS" = 2 ]; then
142   - printf "create symlink 2: '${REPO}/'"
  145 + printf "create symlink 2: '${REPO}/'\n"
143 146 REPO_SEP=($(printf "$REPO" | tr "/" "\n"))
144 147 if [ ${REPO_SEP[1]} ]; then
145 148 REPO=${REPO_SEP[1]}
146 149 PATH_PREFIX+="/${REPO_SEP[0]}"
147 150 fi
148   - ln -s ../${PATH_PREFIX}/${REPO} ${SYMLINKS_PATH}/${REPO}
  151 + ln -s "../../${PATH_PREFIX}/${REPO}" "${SYMLINKS_PATH}/${REPO}"
149 152 PATH_PREFIX=".repos"
150 153 elif [ "$CREATE_LINKS" = 3 ]; then
151 154 ln -s ${SYMLINKS_PATH}/${REPO} ${PATH_START}/
... ... @@ -154,16 +157,22 @@ else
154 157 fi
155 158 CREATE_LINKS=1
156 159 fi
157   - printf "..................................................DONE................................................."
  160 +
  161 + REMOTE_BRANCH=${MAIN_BRANCH}
  162 +
  163 + printf "..................................................DONE.................................................\n\n"
158 164 done
  165 +
159 166 if [ "$UPDATE" = "1" ]; then
160 167 printf 'Repos updated:\n---------------\n' + "$ADDED_REPOS" + '\n'
161 168 elif [ "$ADDED_REPOS" != "" ]; then
162 169 printf "$ADDED_REPOS\n" >> ADD.md
163 170 fi
  171 +
164 172 if [ "$NOT_ADDED_REPOS" != "" ]; then
165 173 printf "$NOT_ADDED_REPOS" >> exists.txt
166 174 fi
  175 +
167 176 find -name "*.pyc" -delete
168 177 find -name "*.pyo" -delete
169 178 find -name "*.pyd" -delete
... ... @@ -186,4 +195,4 @@ else
186 195 find -name "__MACOSX" -exec rm -r "{}" \;
187 196 find -name "__pycache__" -exec rm -r "{}" \;
188 197 find -name "develop-eggs" -exec rm -r "{}" \;
189   -fi
190 198 \ No newline at end of file
  199 +fi