Adding make

diff --git a/.gitignore b/.gitignore
index d58637e48dab0e8324740b01103e927da2ca6777..a5d79693bc94835077ccf3b500edb9fa36c62387 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
-_site*
 .jekyll-cache
+.bundle
 m
+vendor
+_site

diff --git a/Gemfile b/Gemfile
index 1f68a1ae80ae63aca8af3791ecc22e8bdea415dd..360fb464f249bf84733191afb081b1d4a9272b95 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,7 @@
 
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# gem "rails"
-gem 'jekyll-paginate'
 gem "jekyll", "~> 4.2"
-gem "webrick", "~> 1.7"
+gem "webrick", "~> 1.8"
+gem "jekyll-paginate"
+gem "jekyll-feed"

diff --git a/Gemfile.lock b/Gemfile.lock
index 72f0876a5ddd61a84deff69ccba4a9e2fce3b125..fb3741161ed50b3a4c0c695d7c874478a17892b0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,72 +1,76 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.2.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.0)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    google-protobuf (3.23.4-arm64-darwin)
+    http_parser.rb (0.8.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.0)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.5.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    rb-fsevent (0.10.4)
+    public_suffix (5.0.3)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (4.1.2)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
-    webrick (1.7.0)
+    sass-embedded (1.63.6-arm64-darwin)
+      google-protobuf (~> 3.23)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
-  arm64-darwin-20
   arm64-darwin-21
 
 DEPENDENCIES
   jekyll (~> 4.2)
+  jekyll-feed
   jekyll-paginate
-  webrick (~> 1.7)
+  webrick (~> 1.8)
 
 BUNDLED WITH
    2.3.26

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..9d2fb14
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,57 @@
+
+
+
+init:
+       bundle init
+       bundle add jekyll --version "~>4.2"
+
+install:
+       bundle config set --local path 'vendor/bundle'
+       bundle install
+       bundle update
+
+dev:
+       bundle exec jekyll serve --livereload --port 4001
+#      bundle exec jekyll serve --config _config.local.yml --port 4001
+
+
+build:
+       bundle exec jekyll build
+       
+pushrepo:
+       git push
+       git push quilime
+       git push gitea
+       git push local
+
+
+EXCLUDE := $(if $(nomedia),--exclude m,)
+publish:
+       # Publishing gabrieldunne.com
+       rm -rf _site
+       bundle exec jekyll build --config _config.yml
+       rsync -varz ${EXCLUDE} _site/ quilime@quilime.com:/home/quilime/gabrieldunne.com/public/ --delete
+
+       # Publishing gld.studio
+       rm -rf _site
+       bundle exec jekyll build --config _config.studio.yml
+       rsync -varz ${EXCLUDE} _site/ quilime@quilime.com:/home/quilime/gld.studio/public/ --delete             
+
+
+
+#!/bin/bash
+# set -x
+
+# EXCLUDE=""
+# if [ $1 ] && [ $1 == "--nomedia" ]; then
+#     echo "Publishing with --nomedia flag..."
+#     EXCLUDE="--exclude ./m"
+# fi
+
+# # gld.studio
+# echo "Building..."
+# rm -rf _site
+# bundle exec jekyll build --config _config.studio.yml
+# echo "Syncing..."
+# rsync -varz _site/ quilime@quilime.com:/home/quilime/gld.studio/public/ --delete $EXCLUDE
+

diff --git a/_config.local.yml b/_config.local.yml
index ca89c2322fdecbd8e35a6e03c94f9241222f8c46..2069a7c26e42def24197ffd006d0ba66cd35363f 100644 (file)
--- a/_config.local.yml
+++ b/_config.local.yml
@@ -5,6 +5,7 @@ description: Gabriel Dunne
 author : Gabriel Dunne
 author_url : https://gld.studio
 author_email : contact@gld.studio
+analytics: 000
 markdown : kramdown
 highlighter : true
 paginate : 8

diff --git a/_config.yml b/_config.yml
index b4c40266a8dce858dfe55dba17582aa622b0097c..fcc4bad6ec45bd426192282d3973a7ff729caf9d 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,5 @@
 url : https://gabrieldunne.com
+
 name : gld
 description: Gabriel Dunne
 author : Gabriel Dunne

diff --git a/_posts/projects/2006-05-05-celestialmechanics.md b/_posts/projects/2006-05-05-celestialmechanics.md
index b9bded3a2a8050a235bc1c020bdb2ee80218a01b..67448c78205c5836689c06c6ede55d85e90b1d8c 100755 (executable)
--- a/_posts/projects/2006-05-05-celestialmechanics.md
+++ b/_posts/projects/2006-05-05-celestialmechanics.md
@@ -13,7 +13,7 @@ By D. Scott Hessels and Gabriel L. Dunne
 
 Celestial Mechanics is a planetarium-based artwork installation that visualizes the statistics, data, and protocols of manmade aerial technologies -- a graphic display of the paths and functions of the machines hovering, flying, and drifting above our planet. The sky is filled with aircraft that transport people from place to place, perform utilitarian duties, assist in communications, enact military missions, or wander above us as debris. Celestial Mechanics combines science, statistical display, and contemporary art by presenting these mechanical patterns and behaviors as a celestial mythology. The artwork is intended to be viewed in a planetarium dome, and as time permits the authors, it is updated.
 
-[Website](http://cmlab.com/)
+more info [https://celestialmechanics.info](https://celestialmechanics.info/)
 
 ## Statement
 

diff --git a/_posts/projects/2008-07-05-cabspotting.md b/_posts/projects/2008-07-05-cabspotting.md
index 538652ac09a3af67e660ecf4f05b34e3c711cd76..112915ce8168944adb33570b4a170264c807714f 100755 (executable)
--- a/_posts/projects/2008-07-05-cabspotting.md
+++ b/_posts/projects/2008-07-05-cabspotting.md
@@ -6,7 +6,7 @@ layout: post
 thumb: /m/cabspotting/thumb.png\r
 ---\r
 \r
-<iframe src="http://player.vimeo.com/video/68519298?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff" width="800" height="500" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>\r
+<iframe src="https://player.vimeo.com/video/68519298?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff" width="800" height="500" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>\r
 \r
 ### "Cabspotting" San Francisco Taxi-Cab Visualization\r
 \r

diff --git a/about.md b/about.md
index fb7d5b9f7bed7a1f4b0c3e85de63cca9abba060f..e950c7ec6ed3e218fec200fb9c03c5ecc8a1e32c 100644 (file)
--- a/about.md
+++ b/about.md
@@ -13,6 +13,11 @@ personal website of Gabriel Dunne
 studio [at] gabrieldunne [dot] com
 
 
+## location
+
+san francisco bay area
+
+
 ## rss feed
 
 <a href="{{ site.url }}/feed.xml">rss</a>

diff --git a/publish b/publish
deleted file mode 100755 (executable)
index cbf2523..0000000
--- a/publish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# set -x
-
-EXCLUDE=""
-if [ $1 ] && [ $1 == "--nomedia" ]; then
-    echo "Publishing with --nomedia flag..."
-    EXCLUDE="--exclude ./m"
-fi
-
-# gld.studio
-echo "Building..."
-rm -rf _site
-bundle exec jekyll build --config _config.yml
-echo "Syncing..."
-rsync -varz _site/ quilime@quilime.com:/home/quilime/gabrieldunne.com/public/ --delete $EXCLUDE

diff --git a/publish-gld.studio b/publish-gld.studio
deleted file mode 100755 (executable)
index 8484f70..0000000
--- a/publish-gld.studio
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# set -x
-
-EXCLUDE=""
-if [ $1 ] && [ $1 == "--nomedia" ]; then
-    echo "Publishing with --nomedia flag..."
-    EXCLUDE="--exclude ./m"
-fi
-
-# gld.studio
-echo "Building..."
-rm -rf _site
-bundle exec jekyll build --config _config.studio.yml
-echo "Syncing..."
-rsync -varz _site/ quilime@quilime.com:/home/quilime/gld.studio/public/ --delete $EXCLUDE

diff --git a/push b/push
deleted file mode 100755 (executable)
index c8eff23..0000000
--- a/push
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-git push; git push quilime; git push gitea; git push local

diff --git a/serve b/serve
deleted file mode 100755 (executable)
index c256fe7..0000000
--- a/serve
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bundle exec jekyll serve --config _config.local.yml --port 4001