From 385099c4f70f78585b9e09db00afb8aa027452f2 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 2 Jan 2014 21:47:01 +0000 Subject: [PATCH] Clarify references to sudo --- .../tiddlers/dev/Installing TiddlyWiki on Node.js.tid | 5 +++-- .../tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid | 8 +++++++- .../dev/Working with the TiddlyWiki5 repository.tid | 4 ++-- readme.md | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid index 050af998a..df7130022 100644 --- a/editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/dev/Installing TiddlyWiki on Node.js.tid @@ -1,5 +1,5 @@ created: 20131219100608529 -modified: 20140102200617777 +modified: 20140102214547249 tags: howto title: Installing TiddlyWiki on Node.js type: text/vnd.tiddlywiki @@ -8,7 +8,8 @@ type: text/vnd.tiddlywiki # Open a command line terminal and type: #> `npm install -g tiddlywiki` #> If it fails with an error you may need to re-run the command as an administrator: -#> `sudo npm install -g tiddlywiki` +#> `npm install -g tiddlywiki` (Windows) +#> `sudo npm install -g tiddlywiki` (Mac/Linux) # Check TiddlyWiki is installed by typing: #> `tiddlywiki --version` # In response, you should see TiddlyWiki report its current version (eg `5.0.4-beta`; you may also see other debugging information reported) diff --git a/editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid index 7cb300918..e54990bd8 100644 --- a/editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/dev/Upgrading TiddlyWiki on Node.js.tid @@ -1,11 +1,17 @@ created: 20131219100544073 -modified: 20140101173918748 +modified: 20140102214521628 tags: howto title: Upgrading TiddlyWiki on Node.js type: text/vnd.tiddlywiki If you've installed [[TiddlyWiki on Node.js]] on the usual way, when a new version is released you can upgrade it with this command: +``` +npm update -g tiddlywiki +``` + +On Mac or Linux you'll need to add ''sudo'' like this: + ``` sudo npm update -g tiddlywiki ``` diff --git a/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid b/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid index 8ce20d13d..7d3cd5e64 100644 --- a/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid +++ b/editions/tw5.com/tiddlers/dev/Working with the TiddlyWiki5 repository.tid @@ -1,5 +1,5 @@ created: 20131219100444289 -modified: 20131219163213430 +modified: 20140102214438862 tags: dev howto title: Working with the TiddlyWiki5 repository type: text/vnd.tiddlywiki @@ -11,7 +11,7 @@ If you plan on working with the TiddlyWiki5 source code then follow these steps: # Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5 # Clone a local copy of your fork # Open a command line terminal and change the current working directory to the root of the repo -# Type `sudo npm link` to tell [[npm]] to use this copy of the repo as the globally installed one +# Type `npm link` (Windows) or `sudo npm link` (Mac/Linux) to tell [[npm]] to use this copy of the repo as the globally installed one After this procedure you can work with TiddlyWiki5 via [[npm]] as though it were installed in the usual way with `npm -g install tiddlywiki`. diff --git a/readme.md b/readme.md index 857064d0f..2799fef91 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@

Welcome to TiddlyWiki

Welcome to TiddlyWiki, a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

This is version 5.0.6-prerelease of TiddlyWiki, a major reboot designed for the next 25 years. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to get involved and support the future development of TiddlyWiki.

TiddlyWiki is a free, open source project that depends on your love and support for its survival.

TiddlyWikiClassic - http://classic.tiddlywiki.com

On this site, unless noted otherwise, "TiddlyWiki" refers to the new version 5, and "TiddlyWikiClassic" is used to identify the older version.

The deep internal improvements mean that the new version of TiddlyWiki is not fully compatible with TiddlyWikiClassic. Existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures. -

Getting started with TiddlyWiki under Node.js

Running TiddlyWiki on Node.js brings several important benefits over and above the single file version:

Installation

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    sudo npm install -g tiddlywiki

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.4-beta; you may also see other debugging information reported)
  5. Try it out:
    1. mkdir mywiki to create a folder for a new wiki
    2. cd mywiki to move into the new folder
    3. tiddlywiki --server to start TiddlyWiki
    4. Visit http://0.0.0.0:8080/ in your browser
    5. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

A slightly different method for installation is recommended if you plan on forking the source code in order to study it or contribute to it. See Working with the TiddlyWiki5 repository. +

Getting started with TiddlyWiki under Node.js

Running TiddlyWiki on Node.js brings several important benefits over and above the single file version:

Installation

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    npm install -g tiddlywiki (Windows)

    sudo npm install -g tiddlywiki (Mac/Linux)

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.4-beta; you may also see other debugging information reported)
  5. Try it out:
    1. mkdir mywiki to create a folder for a new wiki
    2. cd mywiki to move into the new folder
    3. tiddlywiki --server to start TiddlyWiki
    4. Visit http://127.0.0.1:8080/ in your browser
    5. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

A slightly different method for installation is recommended if you plan on forking the source code in order to study it or contribute to it. See Working with the TiddlyWiki5 repository.

Usage

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

The commands and their individual arguments follow, each command being identified by the prefix --.

tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

The available commands are:

-

Upgrading

If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

sudo npm update -g tiddlywiki

Commands

The following commands are available:

-

Working with the TiddlyWiki5 repository

Setting Up

If you plan on working with the TiddlyWiki5 source code then follow these steps:

  1. Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5
  2. Clone a local copy of your fork
  3. Open a command line terminal and change the current working directory to the root of the repo
  4. Type sudo npm link to tell npm to use this copy of the repo as the globally installed one

After this procedure you can work with TiddlyWiki5 via npm as though it were installed in the usual way with npm -g install tiddlywiki.

See also Scripts for TiddlyWiki on Node.js.

This readme file was automatically generated by TiddlyWiki +

Upgrading

If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

npm update -g tiddlywiki

On Mac or Linux you'll need to add sudo like this:

sudo npm update -g tiddlywiki

Commands

The following commands are available:

+

Working with the TiddlyWiki5 repository

Setting Up

If you plan on working with the TiddlyWiki5 source code then follow these steps:

  1. Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5
  2. Clone a local copy of your fork
  3. Open a command line terminal and change the current working directory to the root of the repo
  4. Type npm link (Windows) or sudo npm link (Mac/Linux) to tell npm to use this copy of the repo as the globally installed one

After this procedure you can work with TiddlyWiki5 via npm as though it were installed in the usual way with npm -g install tiddlywiki.

See also Scripts for TiddlyWiki on Node.js.

This readme file was automatically generated by TiddlyWiki

\ No newline at end of file