Skip to content

Commit a363aba

Browse files
committed
corrected generate script
1 parent 230696a commit a363aba

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

scripts/generate-dist-files

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,42 @@ echo "==> Generating install-docker scripts..."
1010
DOCKER_GIT_COMMIT_LAST=$(curl -Lsk http://get.docker.com/ | grep "^SCRIPT_COMMIT_SHA=" | cut -d= -f2 | tr -d '"')
1111

1212
for DOCKER_VERSION in $(ls -1 .); do
13-
if [ -f "${DOCKER_VERSION}/${DOCKER_VERSION}.diff" ] ; then
14-
echo "==> Checking pkg/$DOCKER_VERSION ..."
15-
if [ -f $DOCKER_VERSION/config.sh ]; then
16-
source $DOCKER_VERSION/config.sh
17-
fi
18-
DOCKER_GIT_REPO=${DOCKER_GIT_REPO:-"https://github.com/docker/docker-install"}
19-
if [ -z "${DOCKER_GIT_COMMIT}" ]; then
20-
echo "==> [ERROR] DOCKER_GIT_COMMIT var should be defined at pkg/$DOCKER_VERSION/config.sh"
21-
exit 1
22-
fi
23-
if [ ! -z "$DOCKER_GIT_COMMIT_LAST" ]; then
24-
if [ $DOCKER_GIT_COMMIT != $DOCKER_GIT_COMMIT_LAST ]; then
25-
echo "==> [INFO] dist/$DOCKER_VERSION_SHORT/$DOCKER_VERSION.sh is generated from DOCKER_GIT_COMMIT [$DOCKER_GIT_COMMIT], latest released commit is [$DOCKER_GIT_COMMIT_LAST]"
26-
fi
27-
fi
28-
if [ ! -f ../dist/$DOCKER_VERSION.sh ]; then
29-
echo "==> Generating dist/$DOCKER_VERSION.sh..."
30-
cd $DOCKER_VERSION
31-
if [ -d docker-install ]; then
32-
rm -rf docker-install
33-
fi
34-
git clone ${DOCKER_GIT_REPO}
35-
cd docker-install
36-
git checkout ${DOCKER_GIT_COMMIT}
37-
make
38-
cp build/install.sh ../$DOCKER_VERSION.sh
39-
cd .. && rm -rf docker-install
40-
patch $DOCKER_VERSION.sh $DOCKER_VERSION.diff
41-
cd ..
42-
mv $DOCKER_VERSION/$DOCKER_VERSION.sh ../dist/
43-
echo "[OK] Generated dist/$DOCKER_VERSION.sh"
44-
DOCKER_VERSION_SHORT=$(echo $DOCKER_VERSION| cut -d. -f1,2)
45-
echo " Update dist/$DOCKER_VERSION_SHORT.sh link if required: rm $DOCKER_VERSION_SHORT.sh && ln -s $DOCKER_VERSION.sh $DOCKER_VERSION_SHORT.sh"
46-
else
47-
echo "[OK] Skipped dist/$DOCKER_VERSION.sh already generated..."
48-
fi
49-
unset DOCKER_GIT_REPO DOCKER_GIT_COMMIT
50-
fi
13+
if [ -f "${DOCKER_VERSION}/${DOCKER_VERSION}.diff" ] ; then
14+
echo "==> Checking pkg/$DOCKER_VERSION ..."
15+
if [ -f $DOCKER_VERSION/config.sh ]; then
16+
source $DOCKER_VERSION/config.sh
17+
fi
18+
DOCKER_GIT_REPO=${DOCKER_GIT_REPO:-"https://github.com/docker/docker-install"}
19+
if [ -z "${DOCKER_GIT_COMMIT}" ]; then
20+
echo "==> [ERROR] DOCKER_GIT_COMMIT var should be defined at pkg/$DOCKER_VERSION/config.sh"
21+
exit 1
22+
fi
23+
if [ ! -z "$DOCKER_GIT_COMMIT_LAST" ]; then
24+
if [ $DOCKER_GIT_COMMIT != $DOCKER_GIT_COMMIT_LAST ]; then
25+
echo "==> [INFO] dist/$DOCKER_VERSION_SHORT/$DOCKER_VERSION.sh is generated from DOCKER_GIT_COMMIT [$DOCKER_GIT_COMMIT], latest released commit is [$DOCKER_GIT_COMMIT_LAST]"
26+
fi
27+
fi
28+
if [ ! -f ../dist/$DOCKER_VERSION.sh ]; then
29+
echo "==> Generating dist/$DOCKER_VERSION.sh..."
30+
cd $DOCKER_VERSION
31+
if [ -d docker-install ]; then
32+
rm -rf docker-install
33+
fi
34+
git clone ${DOCKER_GIT_REPO}
35+
cd docker-install
36+
git checkout ${DOCKER_GIT_COMMIT}
37+
make
38+
cp build/stable/install.sh ../$DOCKER_VERSION.sh
39+
cd .. && rm -rf docker-install
40+
patch $DOCKER_VERSION.sh $DOCKER_VERSION.diff
41+
cd ..
42+
mv $DOCKER_VERSION/$DOCKER_VERSION.sh ../dist/
43+
echo "[OK] Generated dist/$DOCKER_VERSION.sh"
44+
DOCKER_VERSION_SHORT=$(echo $DOCKER_VERSION| cut -d. -f1,2)
45+
echo " Update dist/$DOCKER_VERSION_SHORT.sh link if required: rm $DOCKER_VERSION_SHORT.sh && ln -s $DOCKER_VERSION.sh $DOCKER_VERSION_SHORT.sh"
46+
else
47+
echo "[OK] Skipped dist/$DOCKER_VERSION.sh already generated..."
48+
fi
49+
unset DOCKER_GIT_REPO DOCKER_GIT_COMMIT
50+
fi
5151
done

0 commit comments

Comments
 (0)