COMMIT_MSG=$(git config --list | grep "user.name" | cut -d = -f 2) &&
COMMIT_MSG=$COMMIT_MSG": "                                         &&
COMMIT_MSG=$COMMIT_MSG$(git log -1 --oneline)                      &&
echo $COMMIT_MSG                                                   &&

grunt dist                        &&
WEBSITE="website"                 &&
cd $WEBSITE                       &&



git pull --rebase                 &&
cp CNAME /tmp/CNAME               &&
cp 404.html /tmp/404.html         &&
rm -rf *                          &&
cp /tmp/CNAME CNAME               &&
cp /tmp/404.html 404.html         &&
git rm *                          &&
git add CNAME                     &&
git add 404.html                  &&
cp -r ../dist/* ./                &&
git add .                         &&
git commit -am "$COMMIT_MSG"      &&
git push origin HEAD --force      &&
cd ..                             &&
git commit -o website -m "Update website with current changes" &&

echo "Successfully built package"

COMMIT_MSG=$(git config --list | grep "user.name" | cut -d = -f 2) &&
COMMIT_MSG=$COMMIT_MSG": "                                         &&
COMMIT_MSG=$COMMIT_MSG$(git log -1 --oneline)                      &&
echo $COMMIT_MSG                                                   &&

grunt dist                        &&
WEBSITE="website"                 &&
cd $WEBSITE                       &&



git pull                          &&
cp CNAME /tmp/CNAME               &&
cp 404.html /tmp/404.html         &&
rm -rf *                          &&
git rm *                          &&
cp /tmp/CNAME CNAME               &&
cp /tmp/404.html 404.html         &&
git add CNAME                     &&
git add 404.html                  &&
cp -r ../dist/* ./                &&
git add .                         &&
git commit -am "$COMMIT_MSG"      &&
git push origin HEAD --force      &&
cd ..                             &&
git commit -o website -m "Update website with current changes" &&

echo "Successfully built package"

Move git rm to the proper line
Move git rm to the proper line
