diff --git a/script/pbot b/bin/pbot similarity index 76% rename from script/pbot rename to bin/pbot index b223ffb5..78f22922 100755 --- a/script/pbot +++ b/bin/pbot @@ -7,8 +7,13 @@ # SPDX-FileCopyrightText: 2021 Pragmatic Software # SPDX-License-Identifier: MIT +# to find real location of pbot script use FindBin qw($RealBin); + +# allow loading of Perl packages from this location use lib "$RealBin/../lib"; + +# allow loading of PBot plugins from ~/.pbot use lib "$ENV{HOME}/.pbot"; use PBot::Core; diff --git a/doc/QuickStart.md b/doc/QuickStart.md index 310fa56e..8b5cadd8 100644 --- a/doc/QuickStart.md +++ b/doc/QuickStart.md @@ -83,11 +83,11 @@ After git-cloning (or unpacking the ZIP archives) you should have a directory na Name | Description --- | --- [`Plang/`](https://github.com/pragma-/Plang) | Plang scripting language +[`bin/`](../bin) | PBot executables (e.g., [`bin/pbot`](../bin/pbot)) [`data/`](../data) | Default data-directory [`doc/`](../doc) | Helpful documentation [`lib/`](../lib) | PBot source tree [`modules/`](../modules) | External command-line executables invokable as PBot commands -[`script/`](../script) | PBot executables (e.g., [`script/pbot`](../script/pbot)) [`updates/`](../updates) | Migration scripts run automatically by PBot after updates that modify data structures [`cpanfile`](../cpanfile) | CPAN dependencies file @@ -144,7 +144,7 @@ The local::lib set-up will be lost when you close your shell. To make the set-up #### Using cpanminus Ensure you have set your current working directory to where you have git cloned or unzipped PBot. There should be a [`cpanfile`](../cpanfile) in the current -directory, along with [`lib/`](../lib) and [`script/`](../script) directories. +directory, along with [`lib/`](../lib) and [`bin/`](../bin) directories. $ cd pbot (or pbot-master) @@ -265,11 +265,11 @@ recommended settings should suffice. If you have any issues, please [report them or by sending `pragma-` a message on the Libera.Chat network. ## Starting PBot -The executable to start PBot is `script/pbot`. You may create a symbolic -link to the `script/pbot` executable in `$HOME/bin/` or in `/usr/local/bin/`. +The executable to start PBot is `bin/pbot`. You may create a symbolic +link to the `bin/pbot` executable in `$HOME/bin/` or in `/usr/local/bin/`. -If you choose not to install the `script/pbot` file to your PATH, remember -to use `./script/pbot` instead of `pbot` in the following examples. +If you choose not to install the `bin/pbot` file to your PATH, remember +to use `./bin/pbot` instead of `pbot` in the following examples. ### Usage $ pbot [directory overrides...] [registry overrides...] diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm index bfac7a78..8dd93260 100644 --- a/lib/PBot/VERSION.pm +++ b/lib/PBot/VERSION.pm @@ -25,8 +25,8 @@ use PBot::Imports; # These are set by the /misc/update_version script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 4353, - BUILD_DATE => "2021-08-13", + BUILD_REVISION => 4355, + BUILD_DATE => "2021-08-15", }; sub initialize {} diff --git a/updates/4355_restart_required.pl b/updates/4355_restart_required.pl new file mode 100755 index 00000000..a9348e63 --- /dev/null +++ b/updates/4355_restart_required.pl @@ -0,0 +1,7 @@ +#!/usr/bin/env perl + +# Recent updates require a bot restart +# +# Moved script/ to bin/. + +exit 0;