Browse Source

remove squiggle.city mention, replace github with code.p1k3.com

master
Brennen Bearnes 2 years ago
parent
commit
33b53526cf
6 changed files with 50 additions and 71 deletions
  1. +5
    -6
      README.md
  2. +4
    -4
      endmatter/index.md
  3. +7
    -10
      get_shell/index.md
  4. +27
    -48
      index.html
  5. +2
    -1
      links.md
  6. +5
    -2
      render.pl

+ 5
- 6
README.md View File

@ -3,7 +3,7 @@ userland: a book about the command line for humans
This is the source for some text which can be found here:
[http://p1k3.com/userland-book/](//p1k3.com/userland-book)
[p1k3.com/userland-book/](https://p1k3.com/userland-book)
...which is probably the best place to read it.
@ -27,11 +27,10 @@ From the introduction:
> day, but for whom the command line environment seems mystifying, obscure, or
> generally uninviting. I intend to gloss over many complexities in favor of
> demonstrating a rough-and-ready toolset.
>
[p1k3.com/userland-book.git](//p1k3.com/userland-book.git) is the canonical git
repo, but I'm pushing everything to a [GitHub
mirror](https://github.com/brennen/userland-book), and welcome feedback there.
[code.p1k3.com/gitea/brennen/userland-book](https://code.p1k3.com/gitea/brennen/userland-book)
is the canonical git repo, for the moment. There's also a [GitHub
mirror](https://github.com/brennen/userland-book).
how
---
@ -75,4 +74,4 @@ these days I'll wrap up all the dependencies in a package.
author
------
Brennen Bearnes (p1k3.com / @brennen)
Brennen Bearnes (p1k3.com)

+ 4
- 4
endmatter/index.md View File

@ -12,10 +12,10 @@ further reading
code
----
<a href="https://p1k3.com/userland-book.git">p1k3.com/userland-book.git</a>
should be considered the canonical git repository, but I'm pushing everything
to a <a href="https://github.com/brennen/userland-book">GitHub mirror</a>, and
welcome feedback there.
As of July 2018, source for this work can be found <a
href="https://code.p1k3.com/gitea/brennen/userland-book">on code.p1k3.com</a>.
I welcome feedback there, <a href="https://mastodon.social/brennen">on
Mastodon</a>, or by mail to userland@p1k3.com.
copying
-------


+ 7
- 10
get_shell/index.md View File

@ -14,18 +14,15 @@ That doesn't happen as often now, but in the meanwhile computers have become
relatively cheap and free software is abundant. If you're reading this on the
web, you can probably get access to a shell. Some options follow.
ask for an account on squiggle.city
-----------------------------------
get an account on a social unix server
--------------------------------------
[squiggle.city][squiggle] is a server I'm running explicitly for teaching
purposes, modeled on [tilde.club][tildeclub].
Check out [tilde.town][tildetown]:
You can get ahold of me by mailing bbearnes at Google's giant e-mail service,
or on twitter [as @brennen][atbrennen]. Just let me know you'd like an account
and I'll walk you through the basics.
Limited time offer, contains no implied warranty of fitness or merchantability,
accounts free while supplies last!
> tilde.town is an intentional digital community for making art, socializing, and
> learning. Unlike many online spaces, users interact with tilde.town through a
> direct connection instead of a web site. This means using a tool called ssh and
> other text based tools.
use a raspberry pi or beaglebone
--------------------------------


+ 27
- 48
index.html View File

@ -42,7 +42,7 @@ most of the time. I still get some stuff done.</p>
<li><a href="#get-you-a-shell">0. get you a shell</a>
<ul>
<li><a href="#ask-for-an-account-on-squiggle-city">ask for an account on squiggle.city</a></li>
<li><a href="#get-an-account-on-a-social-unix-server">get an account on a social unix server</a></li>
<li><a href="#use-a-raspberry-pi-or-beaglebone">use a raspberry pi or beaglebone</a></li>
<li><a href="#use-a-virtual-machine">use a virtual machine</a></li>
</ul>
@ -133,17 +133,14 @@ reading their e-mail.</p>
relatively cheap and free software is abundant. If you&rsquo;re reading this on the
web, you can probably get access to a shell. Some options follow.</p>
<h2><a name=ask-for-an-account-on-squiggle-city href=#ask-for-an-account-on-squiggle-city>#</a> ask for an account on squiggle.city</h2>
<h2><a name=get-an-account-on-a-social-unix-server href=#get-an-account-on-a-social-unix-server>#</a> get an account on a social unix server</h2>
<p><a href="http://squiggle.city/">squiggle.city</a> is a server I&rsquo;m running explicitly for teaching
purposes, modeled on <a href="http://tilde.club/">tilde.club</a>.</p>
<p>Check out <a href="https://tilde.town/">tilde.town</a>:</p>
<p>You can get ahold of me by mailing bbearnes at Google&rsquo;s giant e-mail service,
or on twitter <a href="https://twitter.com/brennen">as @brennen</a>. Just let me know you&rsquo;d like an account
and I&rsquo;ll walk you through the basics.</p>
<p>Limited time offer, contains no implied warranty of fitness or merchantability,
accounts free while supplies last!</p>
<blockquote><p>tilde.town is an intentional digital community for making art, socializing, and
learning. Unlike many online spaces, users interact with tilde.town through a
direct connection instead of a web site. This means using a tool called ssh and
other text based tools.</p></blockquote>
<h2><a name=use-a-raspberry-pi-or-beaglebone href=#use-a-raspberry-pi-or-beaglebone>#</a> use a raspberry pi or beaglebone</h2>
@ -715,9 +712,7 @@ bunzip2 (1) - a block-sorting file compressor, v1.0.6
bzip2 (1) - a block-sorting file compressor, v1.0.6
comm (1) - compare two sorted files line by line
sort (1) - sort lines of text files
sort-dctrl (1) - sort Debian control files
tsort (1) - perform topological sort
wrap-and-sort (1) - wrap long lines and sort items in Debian packaging files
</code></pre>
<!-- end -->
@ -1588,11 +1583,11 @@ filenames, but I wind up using it quite a bit.</p>
2
3
4
/home/brennen/p1k3/archives/2014/1:
5
6
7
8
9
12
14
</code></pre>
<!-- end -->
@ -1604,19 +1599,19 @@ filenames, but I wind up using it quite a bit.</p>
<pre><code>$ find ~/p1k3/archives/2012/ -type f | xargs perl -ne 'print "$1\n" if m{&lt;h2&gt;(.*?)&lt;/h2&gt;}'
pursuit
fragment
this poem again
i'll do better next time
timebinding animals
more observations on gear nerdery &amp;amp; utility fetishism
thrift
A miracle, in fact, means work
&lt;em&gt;technical notes for late october&lt;/em&gt;, or &lt;em&gt;it gets dork out earlier these days&lt;/em&gt;
"figures like Heinlein and Gingrich"
radio
light enough to travel
12:06am
pursuit
fragment
thrift
timebinding animals
more observations on gear nerdery &amp;amp; utility fetishism
this poem again
i'll do better next time
"figures like Heinlein and Gingrich"
</code></pre>
<!-- end -->
@ -1886,7 +1881,7 @@ important:</p>
<pre><code>$ ls -l okpoems
-rwxrwxr-x 1 brennen brennen 163 Apr 19 2014 okpoems
-rwxrwxr-x 1 brennen brennen 163 Apr 19 00:08 okpoems
</code></pre>
<!-- end -->
@ -1906,25 +1901,9 @@ accomplish this by saying something like:</p>
<pre><code>$ ./okpoems
/home/brennen/p1k3/archives/2006/6/29
/home/brennen/p1k3/archives/2011/8/12
/home/brennen/p1k3/archives/2012/10/9
/home/brennen/p1k3/archives/2012/2/1
/home/brennen/p1k3/archives/2013/2/9
/home/brennen/p1k3/archives/2012/3/17
/home/brennen/p1k3/archives/2012/3/26
/home/brennen/p1k3/archives/2014/2/24
/home/brennen/p1k3/archives/2010/9/21
/home/brennen/p1k3/archives/2008/12/18
/home/brennen/p1k3/archives/2013/10/6
/home/brennen/p1k3/archives/2013/2/9
/home/brennen/p1k3/archives/2013/11/18
/home/brennen/p1k3/archives/2013/7/16
/home/brennen/p1k3/archives/2009/8/21
/home/brennen/p1k3/archives/2009/8/20
/home/brennen/p1k3/archives/2009/8/30
/home/brennen/p1k3/archives/2009/8/19
/home/brennen/p1k3/archives/2009/4/5
/home/brennen/p1k3/archives/2009/4/29
</code></pre>
<!-- end -->
@ -3024,7 +3003,7 @@ Sa 2 9 16 23 30
<pre><code>$ ncal -e
April 5 2015
April 20 2014
</code></pre>
<!-- end -->
@ -3057,10 +3036,10 @@ April 5 2015
<pre><code>$ seq 1 5 | shuf
2
5
1
4
3
5
</code></pre>
<!-- end -->
@ -3149,10 +3128,10 @@ April 5 2015
<h2><a name=code href=#code>#</a> code</h2>
<p><a href="https://p1k3.com/userland-book.git">p1k3.com/userland-book.git</a>
should be considered the canonical git repository, but I&rsquo;m pushing everything
to a <a href="https://github.com/brennen/userland-book">GitHub mirror</a>, and
welcome feedback there.</p>
<p>As of July 2018, source for this work can be found <a
href="https://code.p1k3.com/gitea/brennen/userland-book">on code.p1k3.com</a>.
I welcome feedback there, <a href="https://mastodon.social/brennen">on
Mastodon</a>, or by mail to userland@p1k3.com.</p>
<h2><a name=copying href=#copying>#</a> copying</h2>


+ 2
- 1
links.md View File

@ -1,8 +1,9 @@
[p1k3]: //p1k3.com/
[atbrennen]: https://twitter.com/brennen
[atbrennen]: https://mastodon.social/@brennen
[kwic]: http://en.wikipedia.org/wiki/Key_Word_in_Context
[www]: http://info.cern.ch/hypertext/WWW/TheProject.html
[virtualbox]: https://www.virtualbox.org/wiki/Downloads
[userland-debian-image]: https://getyouashell.com/
[squiggle]: http://squiggle.city/
[tildeclub]: http://tilde.club/
[tildetown]: https://tilde.town/

+ 5
- 2
render.pl View File

@ -21,7 +21,10 @@ while (my $source = get_input()) {
# A simple preprocessor:
my ($basename, $dir) = fileparse($ARGV); # get path of target file
chdir $dir;
$source =~ s{<!-- exec -->(.*?)<!-- end -->}{handle_block($1);}egs;
# XXX: temporarily disabled until code examples are updated:
# $source =~ s{<!-- exec -->(.*?)<!-- end -->}{handle_block($1);}egs;
chdir $cwd;
$full_source .= "\n\n----\n\n" . $source;
@ -77,7 +80,7 @@ sub replace_some_stuff {
my $contents_text = '<div class=contents>'
. $markdown->markdown((join "\n", @contents), $flags)
. '</div>';
$markup =~ s/{{contents}}/$contents_text/g;
$markup =~ s/\{\{contents\}\}/$contents_text/g;
return $markup;
}


Loading…
Cancel
Save