Permalink
Browse files

A better choice of variable names.

  • Loading branch information...
1 parent ebf986f commit d72f7acf7e20f086b0c62ff57feab43e03f8f5f5 @dak180 dak180 committed Jan 5, 2013
Showing with 7 additions and 7 deletions.
  1. +1 −1 configs/scripts/Release-for-upload.sh
  2. +6 −6 configs/scripts/autorevision.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-. "${OBJROOT}/autorevision.tmp"
+. "${OBJROOT}/autorevision.cache"
BUILD_NUMBER="2821" # Magic number; do not touch!
N_VCS_NUM="$(echo "${BUILD_NUMBER} + ${VCS_NUM}" | bc)"
N_VCS_TAG="$(echo "${VCS_TAG}" | sed -e 's:^v/::')" # for urls/files
@@ -10,13 +10,13 @@ cauto="${OBJROOT}/autorevision.cache"
tauto="${OBJROOT}/autorevision.tmp"
-if ! ./3rdparty/autorevision -o "${tauto}" -t sh; then
+if ! ./3rdparty/autorevision -o "${cauto}" -t sh; then
exit ${?}
fi
# Source the initial autorevision output for filtering.
-. "${tauto}"
+. "${cauto}"
# Filter the output.
@@ -28,21 +28,21 @@ N_VCS_BRANCH="$(echo "${VCS_BRANCH}" | sed -e 's:remotes/:remote/:' -e 's:/:-:'
if [[ ! "${VCS_TICK}" = "0" ]] && [[ ! -z "${VCS_BRANCH}" ]]; then
# If we are not exactly on a tag try using the branch name instead
- sed -e "s:${VCS_TAG}:${N_VCS_BRANCH}:" -e "s:${VCS_BRANCH}:${N_VCS_BRANCH}:" -e "s:${VCS_NUM}:${N_VCS_NUM}:" "${tauto}" > "${cauto}"
+ sed -e "s:${VCS_TAG}:${N_VCS_BRANCH}:" -e "s:${VCS_BRANCH}:${N_VCS_BRANCH}:" -e "s:${VCS_NUM}:${N_VCS_NUM}:" "${cauto}" > "${tauto}"
else
# Prettify the tag name
N_VCS_TAG="$(echo "${VCS_TAG}" | sed -e 's:^v/::' | sed -e 's:_beta: Beta :' -e 's:_rc: RC :')"
- sed -e "s:${VCS_TAG}:${N_VCS_TAG}:" -e "s:${VCS_BRANCH}:${N_VCS_BRANCH}:" -e "s:${VCS_NUM}:${N_VCS_NUM}:" "${tauto}" > "${cauto}"
+ sed -e "s:${VCS_TAG}:${N_VCS_TAG}:" -e "s:${VCS_BRANCH}:${N_VCS_BRANCH}:" -e "s:${VCS_NUM}:${N_VCS_NUM}:" "${cauto}" > "${tauto}"
fi
# Output for src/autorevision.h.
-./3rdparty/autorevision -f -o "${tauto}" -t h > "${hauto}"
+./3rdparty/autorevision -f -o "${cauto}" -t h > "${hauto}"
if [[ ! -f "${fauto}" ]] || ! cmp -s "${hauto}" "${fauto}"; then
cp -a "${hauto}" "${fauto}"
fi
# Output for info.plist prepossessing.
-./3rdparty/autorevision -f -o "${cauto}" -t xcode > "${xauto}"
+./3rdparty/autorevision -f -o "${tauto}" -t xcode > "${xauto}"
exit ${?}

0 comments on commit d72f7ac

Please sign in to comment.