Merge branch 'master' of github.com:willzhang05/sgawebsite

This commit is contained in:
William Zhang 2018-05-02 15:17:53 -04:00
commit 9ad41d9599
4 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ _site
.sass-cache .sass-cache
.jekyll-metadata .jekyll-metadata
Gemfile.lock Gemfile.lock
gems/

View File

@ -1,7 +1,7 @@
# SGA Website # # SGA Website #
## Installing ## ## Installing ##
* `bundle install` - This may required elevated privileges, depending on the machine. * `bundle install --path gems/`
## Running ## ## Running ##
* `bundle exec jekyll serve --port $PORT` where `$PORT` is desired port. * `bundle exec jekyll serve --port $PORT` where `$PORT` is desired port.

View File

@ -20,13 +20,14 @@ description: > # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com url: "" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: tjSGA twitter_username: tjSGA
github_username: willzhang05 #github_username: willzhang05
permalink: pretty permalink: pretty
# Build settings # Build settings
markdown: kramdown markdown: kramdown
#theme: minima #theme: minima
plugins: plugins:
- jekyll-feed - jekyll-feed
exclude: [gems]
jekyll_get: jekyll_get:
- data: about - data: about

2
run.sh
View File

@ -6,6 +6,6 @@
#/web/activities/ghs/public/env/bin/python run.py $PORT #/web/activities/ghs/public/env/bin/python run.py $PORT
#export PATH=$PATH:/home/2018wzhang/.gem/ruby/2.3.0/bin; #export PATH=$PATH:/home/2018wzhang/.gem/ruby/2.3.0/bin;
#/home/2018wzhang/.gem/ruby/2.3.0/bin/bundler exec jekyll serve --port $PORT #/home/2018wzhang/.gem/ruby/2.3.0/bin/bundler exec jekyll serve --port $PORT
jekyll serve --port $PORT bundle exec jekyll serve --port $PORT
#/web/activities/ghs/public/env/bin/python /web/activities/ghs/public/ghswebsite/app.py $PORT #/web/activities/ghs/public/env/bin/python /web/activities/ghs/public/ghswebsite/app.py $PORT