X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=cherry-jprojects.sh;h=627d59d5daa7135c18eadb73c29f6cd7ec19d530;hp=38b989023e04c0361898f3362c81af39c9ca4bf8;hb=829fde031f91c699eb66e34d59158f30a2fa583c;hpb=e073016c17b3fd2ed31d39c01c456771e8897b21 diff --git a/cherry-jprojects.sh b/cherry-jprojects.sh index 38b9890..627d59d 100755 --- a/cherry-jprojects.sh +++ b/cherry-jprojects.sh @@ -19,13 +19,13 @@ for project in ${LIST}; do continue fi - COMMIT_IDS=`cat "${COMMITS_FILE}"` + COMMIT_IDS=$(cat "${COMMITS_FILE}") if [ -n "${COMMIT_IDS}" ] then cd "${JPROJECTS_HOME}/${project}" - echo "$0: Pulling all for project '${project}' ..." - git pull --all + echo "$0: Fetching all for project '${project}' ..." + git fetch --all else echo "$0: Nothing to cherry-pick for '${project}'." rm "${COMMITS_FILE}" @@ -35,7 +35,7 @@ for project in ${LIST}; do echo "$0: Cherry-picking on project '${project}' ..." for commit in ${COMMIT_IDS}; do echo "$0: Working on commit '${commit}' ..." - FOUND_ID=`git rev-list "${commit}" --max-count=1 2>&1` + FOUND_ID=$(git rev-list "${commit}" --max-count=1 2>&1) STATUS="$?" if [ "${STATUS}" != "0" ] @@ -48,7 +48,7 @@ for project in ${LIST}; do git cherry-pick -S "${commit}" || exit 255 echo "$0: Removing commit from list ..." - REMAINING_IDS=`cat ${COMMITS_FILE} | grep -v "${commit}"` + REMAINING_IDS=$(cat ${COMMITS_FILE} | grep -v "${commit}") echo "${REMAINING_IDS}" > ${COMMITS_FILE} done