Browse code

Merge "Change "files" directory in etcd project"

Jenkins authored on 2017/06/07 22:33:58
Showing 1 changed files
... ...
@@ -124,18 +124,18 @@ function _install_etcd {
124 124
     sudo mkdir -p $ETCD_DATA_DIR
125 125
 
126 126
     # Download and cache the etcd tgz for subsequent use
127
-    if [ ! -f "files/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then
127
+    if [ ! -f "$FILES/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then
128 128
         ETCD_DOWNLOAD_FILE=$ETCD_NAME.tar.gz
129
-        wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O files/$ETCD_DOWNLOAD_FILE
130
-        echo "${ETCD_SHA256} files/${ETCD_DOWNLOAD_FILE}" > files/etcd.sha256sum
129
+        wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O $FILES/$ETCD_DOWNLOAD_FILE
130
+        echo "${ETCD_SHA256} $FILES/${ETCD_DOWNLOAD_FILE}" > $FILES/etcd.sha256sum
131 131
         # NOTE(sdague): this should go fatal if this fails
132
-        sha256sum -c files/etcd.sha256sum
132
+        sha256sum -c $FILES/etcd.sha256sum
133 133
 
134
-        tar xzvf files/$ETCD_DOWNLOAD_FILE -C files
135
-        sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
134
+        tar xzvf $FILES/$ETCD_DOWNLOAD_FILE -C $FILES
135
+        sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
136 136
     fi
137 137
     if [ ! -f "$ETCD_BIN_DIR/etcd" ]; then
138
-        sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
138
+        sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
139 139
     fi
140 140
 }
141 141