Skip to content

Commit

Permalink
Better CRLF handling.
Browse files Browse the repository at this point in the history
Instead of converting the setup.sh script to LF, I now tell git to
treat *.sh scripts as text files with LF endings, so it won't be
converted to begin with.
  • Loading branch information
Sheco committed Jan 3, 2015
1 parent 735fbd7 commit f7cceaf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
@@ -0,0 +1,2 @@
* text=auto
*.sh text eol=lf
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -6,5 +6,4 @@ Thumbs.db
.*.sw*
.vagrant
*.zip
/.*
/src/vendor
3 changes: 1 addition & 2 deletions provision.sh
Expand Up @@ -12,7 +12,7 @@ set -e

# download packages
apt-get update
apt-get -y install php5 php5-mcrypt php5-mysql avahi-daemon php-apc unzip dos2unix
apt-get -y install php5 php5-mcrypt php5-mysql avahi-daemon php-apc unzip

# setup php
php5enmod mcrypt
Expand All @@ -29,7 +29,6 @@ curl -sS https://getcomposer.org/installer | php -- --filename=composer --instal

chown $USER "$STORAGE_PATH"

dos2unix "$BASE_PATH"/setup.sh
sudo -u $USER "$BASE_PATH"/setup.sh

echo "Giving access to the webserver"
Expand Down

0 comments on commit f7cceaf

Please sign in to comment.