Merge "4 spaces indent"

This commit is contained in:
Jenkins 2014-05-14 08:26:08 +00:00 committed by Gerrit Code Review
commit a719b9fa5f
30 changed files with 323 additions and 323 deletions

View File

@ -58,8 +58,8 @@ if [ "$rcode" == "200" -o "${url:0:7}" == "file://" ] ; then
mv $tmp $dest mv $tmp $dest
fi fi
fi fi
# 213 is the response to a ftp MDTM command, curl outputs a 213 as the status # 213 is the response to a ftp MDTM command, curl outputs a 213 as the status
# if the url redirected to a ftp server and Not-Modified # if the url redirected to a ftp server and Not-Modified
elif [ "$rcode" = "304" -o "$rcode" = "213" ] ; then elif [ "$rcode" = "304" -o "$rcode" = "213" ] ; then
echo "Server copy has not changed. Using locally cached $url" echo "Server copy has not changed. Using locally cached $url"
rm -f $tmp rm -f $tmp

View File

@ -20,17 +20,17 @@ set -o xtrace
dib-first-boot dib-first-boot
EOF EOF
if [ $FILE_EXISTED ] if [ $FILE_EXISTED ]
then then
echo "mv $rc_local.REAL $rc_local" >> $rc_local echo "mv $rc_local.REAL $rc_local" >> $rc_local
else else
echo "rm \$0" >> $rc_local echo "rm \$0" >> $rc_local
fi fi
echo "exit 0" >> $rc_local echo "exit 0" >> $rc_local
chmod 755 $rc_local chmod 755 $rc_local
# Enable the service # Enable the service
systemctl enable rc-local.service systemctl enable rc-local.service
fi fi

View File

@ -4,7 +4,7 @@ set -eu
set -o pipefail set -o pipefail
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
then then
opts="--force" opts="--force"
if [[ -n "$DIB_SAT_KEY" ]]; then if [[ -n "$DIB_SAT_KEY" ]]; then
opts="$opts --activationkey ${DIB_SAT_KEY}" opts="$opts --activationkey ${DIB_SAT_KEY}"

View File

@ -18,5 +18,5 @@ mv $rc_local.REAL $rc_local
exit 0 exit 0
EOF EOF
chmod 755 $rc_local chmod 755 $rc_local
fi fi