Updateed aggregate and added a few articles

diff --git a/content/code/linux_terminal_win_via_cygwin b/content/code/linux_terminal_win_via_cygwin
deleted file mode 100644 (file)
index 02e3cb0..0000000
--- a/content/code/linux_terminal_win_via_cygwin
+++ /dev/null
@@ -1,69 +0,0 @@
-title = Linux Terminal on Windows via Cygwin
---
-The default Cygwin install emulates a terminal in a command window similar to the DOS prompt with a limited feature set. To get a full featured x-term on windows, install Cygwin-X along with Cygwin.
-
-1. Install <a href="http://cygwin.com">Cygwin</a>
-
-2. Install the following packages:
-
-    - xorg-server (required, the Cygwin X Server)
-    - xinit (required, scripts for starting the X server: xinit, startx, startwin (and a shortcut on the Start Menu to run it), startxdmcp.bat )
-    - xorg-docs (optional, man pages)
-    - X-start-menu-icons (optional, adds shortcuts to X Clients and Server to the Start menu)
-    - any other packages (optional, openssh, version control, editors, etc)
-    - any additional fonts (optional)
-
-    <br />
-
-3. **~/.XDefaults**  
-dark theme:
-<pre class="prettyprint">
-! terminal colors ------------------------------------------------------------
-! tangoesque scheme
-*background: #111111
-*foreground: #babdb6
-! Black (not tango) + DarkGrey
-*color0:  #000000
-*color8:  #555753
-! DarkRed + Red
-*color1:  #ff6565
-*color9:  #ff8d8d
-! DarkGreen + Green
-*color2:  #93d44f
-*color10: #c8e7a8
-! DarkYellow + Yellow
-*color3:  #eab93d
-*color11: #ffc123
-! DarkBlue + Blue
-*color4:  #204a87
-*color12: #3465a4
-! DarkMangenta + Mangenta
-*color5:  #ce5c00
-*color13: #f57900
-!DarkCyan + Cyan (both not tango)
-*color6:  #89b6e2
-*color14: #46a4ff
-! LightGrey + White
-*color7:  #cccccc
-*color15: #ffffff
-</pre>
-Some more themes on the <a href="https://bbs.archlinux.org/viewtopic.php?pid=653473">Arch forums</a>.  
-<br />
-
-4. **~/.bashrc**  
-To enable color `ls` and human readable size format, add:
-<pre class="prettyprint">
-alias ls='ls -h --color=tty'
-</pre>
-By default, the .bashrc in CygwinX has many options you can uncomment.  
-<br />
-
-5. **~/.emacs**
-Disable emacs temp (~) file pooping
-<pre class="prettyprint">
-(setq make-backup-files nil)
-</pre>
-<br />
-
-Result:  
-<img src="http://media.quilime.com/files/img/cygwin.PNG" />
\ No newline at end of file

diff --git a/content/code/osx_print_json b/content/code/osx_print_json
index c84c92db23c47c2f5d2c6e914a08543aa9df6611..1c8284e6bff85f74e73e3d630e6f9728cfa39368 100644 (file)
--- a/content/code/osx_print_json
+++ b/content/code/osx_print_json
@@ -3,6 +3,8 @@ date = mon, nov 14 2011
 tags = bash shell python json xml osx
 --
 
+Working with various interfaces that output json or xml results in lots of situations where you have a single-line, unformatted output. Here's a quick way to format json, xml from the CLI.
+
 via the command line:
 
 format json
@@ -10,11 +12,6 @@ format json
 cat unformatted.json | python -m json.tool
 </pre>
 
-save formated json to file
-<pre class="prettyprint">
-cat unformatted.json | python -m json.tool > formatted.json
-</pre>
-
 format json from clipboard
 <pre class="prettyprint">
 pbpaste | python -m json.tool
@@ -24,5 +21,7 @@ format xml from clipboard
 <pre class="prettyprint">
 pbpaste | xmllint --format -
 </pre>
-`xmllint` is part of libxml2 and installed by default on OSX.
+`xmllint` is part of libxml2 and installed by default on OSX. Be aware that xmllint cleans up XML as well as formatting it, ocassionally modifying the output.
+
+for all above examples, you can pipe back to the clipboard with <code class="prettyprint">| pbcopy</code> at the end of the command, or output to a file with <code class="prettyprint">&gt; output.json</code> or <code class="prettyprint">&gt; output.xml</code>.
 

diff --git a/lib/output.php b/lib/output.php
index 328df1ae1f257af8ab62ec09040ec6dcb8bb95f2..502aa9985078da35d3ee7996ec49e7f396bf5b0d 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -27,6 +27,7 @@ function parse_format($format, $default)
                    'js'   => 'application/x-javascript',
                    'xspf' => 'application/xspf+xml',
                    'xml'  => 'text/xml',
+                   'rss'  => 'text/xml',
                    'jpg'  => 'image/jpeg',
                    'png'  => 'image/png',
                    'm3u'  => 'audio/x-mpegurl');
@@ -133,6 +134,8 @@ function get_rss_feed( $url )
     curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
     $data = curl_exec($ch);
+
+
     curl_close($ch);
     return new SimpleXMLElement($data);
 }

diff --git a/pages/about b/pages/about
index 1b89431d7eb8e1da6074c8892d6f84874a995c2e..d5d6efe89deecbd7e49fa6e1d3636bfc7aae96c2 100644 (file)
--- a/pages/about
+++ b/pages/about
@@ -11,8 +11,8 @@ by **gabriel dunne** ([www](http://gabrieldunne.com), [email](mai
 [ffffound](http://ffffound.com/home/quilime/found/),
 [@quilime](http://twitter.com/quilime/)
 
-quilime.com has taken many forms, originally operating as my online portfolio.   
-<a href="http://portfolio.quilime.com/">View an archive</a> of all projects.
+quilime.com has taken many forms  
+<a href="/projects/">View an archive</a> of all projects.
 
 site update <a href="http://quilime.com/.rss" class="rss">rss</a>
 

diff --git a/pages/projects b/pages/projects
index ebf525dbe4a8602039db73f70ee8d3e845b7221c..4e787c6d17f08feac52f6b49ff9130939123a7df 100644 (file)
--- a/pages/projects
+++ b/pages/projects
@@ -5,7 +5,7 @@ title = projects
 [works 4](http://portfolio.quilime.com/2008/)  
 [works 3](http://portfolio.quilime.com/new/port.php)  
 [works 2](http://portfolio.quilime.com/recent.html)  
-[works 1](http://quilime.com/main.php)  
+[works 1](http://portfolio.quilime.com/archive/)  
  
 <br />
  

diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 6e24b7a3e45877c4716a05bc6f8ef73025e10030..db4d193cf4ab412d35bb6b76777f85b403eee326 100644 (file)
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -10,6 +10,7 @@
        <li><a href="<?=$dir['url']?>"><?=$dir['name']?></a></li>
        <? endforeach; ?>
 
+    <li><a href="/projects/">projects</a></li>
        <li><a href="/photo/">photo</a></li>
        <li><a href="/agg/">aggregate</a></li>
        <li><a href="/links/">links</a></li>