Browse Source

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

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

+ 4
- 4
endmatter/index.md View File

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

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

+ 27
- 48
index.html View File

@@ -42,7 +42,7 @@ most of the time.  I still get some stuff done.</p>
42 42
 <li><a href="#get-you-a-shell">0. get you a shell</a>
43 43
 
44 44
 <ul>
45
-<li><a href="#ask-for-an-account-on-squiggle-city">ask for an account on squiggle.city</a></li>
45
+<li><a href="#get-an-account-on-a-social-unix-server">get an account on a social unix server</a></li>
46 46
 <li><a href="#use-a-raspberry-pi-or-beaglebone">use a raspberry pi or beaglebone</a></li>
47 47
 <li><a href="#use-a-virtual-machine">use a virtual machine</a></li>
48 48
 </ul>
@@ -133,17 +133,14 @@ reading their e-mail.</p>
133 133
 relatively cheap and free software is abundant.  If you&rsquo;re reading this on the
134 134
 web, you can probably get access to a shell.  Some options follow.</p>
135 135
 
136
-<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>
136
+<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>
137 137
 
138
-<p><a href="http://squiggle.city/">squiggle.city</a> is a server I&rsquo;m running explicitly for teaching
139
-purposes, modeled on <a href="http://tilde.club/">tilde.club</a>.</p>
138
+<p>Check out <a href="https://tilde.town/">tilde.town</a>:</p>
140 139
 
141
-<p>You can get ahold of me by mailing bbearnes at Google&rsquo;s giant e-mail service,
142
-or on twitter <a href="https://twitter.com/brennen">as @brennen</a>.  Just let me know you&rsquo;d like an account
143
-and I&rsquo;ll walk you through the basics.</p>
144
-
145
-<p>Limited time offer, contains no implied warranty of fitness or merchantability,
146
-accounts free while supplies last!</p>
140
+<blockquote><p>tilde.town is an intentional digital community for making art, socializing, and
141
+learning. Unlike many online spaces, users interact with tilde.town through a
142
+direct connection instead of a web site. This means using a tool called ssh and
143
+other text based tools.</p></blockquote>
147 144
 
148 145
 <h2><a name=use-a-raspberry-pi-or-beaglebone href=#use-a-raspberry-pi-or-beaglebone>#</a> use a raspberry pi or beaglebone</h2>
149 146
 
@@ -715,9 +712,7 @@ bunzip2 (1)          - a block-sorting file compressor, v1.0.6
715 712
 bzip2 (1)            - a block-sorting file compressor, v1.0.6
716 713
 comm (1)             - compare two sorted files line by line
717 714
 sort (1)             - sort lines of text files
718
-sort-dctrl (1)       - sort Debian control files
719 715
 tsort (1)            - perform topological sort
720
-wrap-and-sort (1)    - wrap long lines and sort items in Debian packaging files
721 716
 </code></pre>
722 717
 
723 718
 <!-- end -->
@@ -1588,11 +1583,11 @@ filenames, but I wind up using it quite a bit.</p>
1588 1583
 2
1589 1584
 3
1590 1585
 4
1586
+
1587
+/home/brennen/p1k3/archives/2014/1:
1591 1588
 5
1592
-6
1593
-7
1594
-8
1595
-9
1589
+12
1590
+14
1596 1591
 </code></pre>
1597 1592
 
1598 1593
 <!-- end -->
@@ -1604,19 +1599,19 @@ filenames, but I wind up using it quite a bit.</p>
1604 1599
 
1605 1600
 
1606 1601
 <pre><code>$ find ~/p1k3/archives/2012/ -type f | xargs perl -ne 'print "$1\n" if m{&lt;h2&gt;(.*?)&lt;/h2&gt;}'
1602
+pursuit
1603
+fragment
1604
+this poem again
1605
+i'll do better next time
1606
+timebinding animals
1607
+more observations on gear nerdery &amp;amp; utility fetishism
1608
+thrift
1607 1609
 A miracle, in fact, means work
1608 1610
 &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;
1609
-"figures like Heinlein and Gingrich"
1610 1611
 radio
1611 1612
 light enough to travel
1612 1613
 12:06am
1613
-pursuit
1614
-fragment
1615
-thrift
1616
-timebinding animals
1617
-more observations on gear nerdery &amp;amp; utility fetishism
1618
-this poem again
1619
-i'll do better next time
1614
+"figures like Heinlein and Gingrich"
1620 1615
 </code></pre>
1621 1616
 
1622 1617
 <!-- end -->
@@ -1886,7 +1881,7 @@ important:</p>
1886 1881
 
1887 1882
 
1888 1883
 <pre><code>$ ls -l okpoems
1889
--rwxrwxr-x 1 brennen brennen 163 Apr 19  2014 okpoems
1884
+-rwxrwxr-x 1 brennen brennen 163 Apr 19 00:08 okpoems
1890 1885
 </code></pre>
1891 1886
 
1892 1887
 <!-- end -->
@@ -1906,25 +1901,9 @@ accomplish this by saying something like:</p>
1906 1901
 
1907 1902
 
1908 1903
 <pre><code>$ ./okpoems
1909
-/home/brennen/p1k3/archives/2006/6/29
1910
-/home/brennen/p1k3/archives/2011/8/12
1911
-/home/brennen/p1k3/archives/2012/10/9
1912
-/home/brennen/p1k3/archives/2012/2/1
1904
+/home/brennen/p1k3/archives/2013/2/9
1913 1905
 /home/brennen/p1k3/archives/2012/3/17
1914 1906
 /home/brennen/p1k3/archives/2012/3/26
1915
-/home/brennen/p1k3/archives/2014/2/24
1916
-/home/brennen/p1k3/archives/2010/9/21
1917
-/home/brennen/p1k3/archives/2008/12/18
1918
-/home/brennen/p1k3/archives/2013/10/6
1919
-/home/brennen/p1k3/archives/2013/2/9
1920
-/home/brennen/p1k3/archives/2013/11/18
1921
-/home/brennen/p1k3/archives/2013/7/16
1922
-/home/brennen/p1k3/archives/2009/8/21
1923
-/home/brennen/p1k3/archives/2009/8/20
1924
-/home/brennen/p1k3/archives/2009/8/30
1925
-/home/brennen/p1k3/archives/2009/8/19
1926
-/home/brennen/p1k3/archives/2009/4/5
1927
-/home/brennen/p1k3/archives/2009/4/29
1928 1907
 </code></pre>
1929 1908
 
1930 1909
 <!-- end -->
@@ -3024,7 +3003,7 @@ Sa  2  9 16 23 30
3024 3003
 
3025 3004
 
3026 3005
 <pre><code>$ ncal -e
3027
-April  5 2015
3006
+April 20 2014
3028 3007
 </code></pre>
3029 3008
 
3030 3009
 <!-- end -->
@@ -3057,10 +3036,10 @@ April  5 2015
3057 3036
 
3058 3037
 <pre><code>$ seq 1 5 | shuf
3059 3038
 2
3060
-5
3061 3039
 1
3062 3040
 4
3063 3041
 3
3042
+5
3064 3043
 </code></pre>
3065 3044
 
3066 3045
 <!-- end -->
@@ -3149,10 +3128,10 @@ April  5 2015
3149 3128
 
3150 3129
 <h2><a name=code href=#code>#</a> code</h2>
3151 3130
 
3152
-<p><a href="https://p1k3.com/userland-book.git">p1k3.com/userland-book.git</a>
3153
-should be considered the canonical git repository, but I&rsquo;m pushing everything
3154
-to a <a href="https://github.com/brennen/userland-book">GitHub mirror</a>, and
3155
-welcome feedback there.</p>
3131
+<p>As of July 2018, source for this work can be found <a
3132
+href="https://code.p1k3.com/gitea/brennen/userland-book">on code.p1k3.com</a>.
3133
+I welcome feedback there, <a href="https://mastodon.social/brennen">on
3134
+Mastodon</a>, or by mail to userland@p1k3.com.</p>
3156 3135
 
3157 3136
 <h2><a name=copying href=#copying>#</a> copying</h2>
3158 3137
 

+ 2
- 1
links.md View File

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

+ 5
- 2
render.pl View File

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