Merge pull request #207 from teoincontatto/doc-version-agnostic

Doc version agnostic
torodb · Sep 11, 2017 · 2831cc9 · 2831cc9
2 parents 807d093 + 79d7cd9
commit 2831cc9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/documentation/docs/installation/binaries.md b/documentation/docs/installation/binaries.md
@@ -8,18 +8,18 @@ Before starting, make sure the [prerequisites](prerequisites.md) are met.
 
 The script below executes the following steps:
 
-1. Download the binary distribution [here](https://www.torodb.com/download/torodb-stampede-1.0.0-beta2.tar.bz2).
+1. Download the binary distribution [here](https://www.torodb.com/download/torodb-stampede-latest.tar.bz2).
 
 2. Extract it
 
 3. Start it using the [default configuration](prerequisites.md#postgresql-configuration) (assuming `.toropass` in the home directory)
 
 ```no-highlight
-wget https://www.torodb.com/download/torodb-stampede-1.0.0-beta2.tar.bz2
+wget https://www.torodb.com/download/torodb-stampede-latest.tar.bz2
 
-tar xjf torodb-stampede-1.0.0-beta2.tar.bz2
+tar xjf torodb-stampede-*.tar.bz2
 
-export TOROHOME="$(pwd)/torodb-stampede-1.0.0-beta2"
+export TOROHOME="$(pwd)/torodb-stampede-*"
 
 "$TOROHOME/bin/torodb-stampede"
 ```
@@ -85,7 +85,7 @@ sudo journalctl --no-tail --no-pager -u torodb-stampede
 
 Follow these steps to download and start ToroDB Stampede using the [default configuration](prerequisites.md#postgresql-configuration) (assuming `.toropass` in the home directory):
 
-1. Download the binary distribution from [here](https://www.torodb.com/download/torodb-stampede-1.0.0-beta2.zip)
+1. Download the binary distribution from [here](https://www.torodb.com/download/torodb-stampede-latest.zip)
 2. Decompress the downloaded Zip file in the desired ToroDB Stampede directory (`%TOROHOME%`)
 3. Execute the command `C:\>%TOROHOME%\bin\torodb-stampede` or double-click on the `torodb-stampede.bat` file in folder `bin`
 

diff --git a/documentation/docs/installation/source-code.md b/documentation/docs/installation/source-code.md
@@ -40,9 +40,9 @@ Extract and launch ToroDB Stampede (replace `$TOROHOME` with the desired ToroDB
 ```no-highlight
 cd "$TOROHOME"
 
-tar xjf "$TOROHOME/stampede/main/target/dist/torodb-stampede-1.0.0-beta2.tar.bz2"
+tar xjf "$TOROHOME/stampede/main/target/dist/torodb-stampede-*.tar.bz2"
 
-torodb-stampede-1.0.0-beta2/bin/torodb-stampede
+torodb-stampede-*/bin/torodb-stampede
 ```
 
 ## Windows
@@ -67,7 +67,7 @@ Create the [`.toropass` file](prerequisites.md#create-toropass-file) in the home
 localhost:5432:torod:torodb:<password>
 ```
 
-Decompress the Zip file in `C:\tmp\torodb\stampede\main\target\dist\torodb-stampede-1.0.0-beta2.zip` (replace `%TOROHOME%` with the desired ToroDB Stampede installation directory) and  execute the following command:
+Decompress the Zip file in `C:\tmp\torodb\stampede\main\target\dist\torodb-stampede-<version>.zip` (replace `%TOROHOME%` with the desired ToroDB Stampede installation directory) and  execute the following command:
 
 ```no-highlight
 C:\>%TOROHOME%\bin\torodb-stampede

diff --git a/documentation/docs/quickstart.md b/documentation/docs/quickstart.md
@@ -62,11 +62,11 @@ Download the latest ToroDB Stampede **binary distribution** from the [downloads
 On Linux, this can be done with the following commands:
 
 ```no-highlight
-wget "https://www.torodb.com/download/torodb-stampede-1.0.0-beta2.tar.bz2"
+wget "https://www.torodb.com/download/torodb-stampede-latest.tar.bz2"
 
-tar xjf torodb-stampede-1.0.0-beta2.tar.bz2
+tar xjf torodb-stampede-*.tar.bz2
 
-torodb-stampede-1.0.0-beta2/bin/torodb-stampede --ask-for-password
+torodb-stampede-*/bin/torodb-stampede --ask-for-password
 ```
 
 ToroDB Stampede will ask for the password of the `torodb` PostgreSQL user you just created.

diff --git a/main/src/main/dist/run/torodb-stampede b/main/src/main/dist/run/torodb-stampede
@@ -23,8 +23,7 @@
 set -e
 
 # resolve links - $0 may be a softlink
-PRG="$0"
-PRG=`which $PRG`
+PRG="$(which "$0"||echo "$0")"
 
 while [ -h "$PRG" ]; do
   ls=`ls -ld "$PRG"`

diff --git a/pom.xml b/pom.xml
@@ -68,6 +68,7 @@
         <profile>
             <id>docs</id>
             <properties>
+		<docs.version>${project.version}</docs.version>
                 <s3.push>false</s3.push>
             </properties>
             <build>
@@ -127,7 +128,7 @@
                                         <argument>s3</argument>
                                         <argument>sync</argument>
                                         <argument>${project.build.directory}/documentation</argument>
-                                        <argument>s3://torodb.com/files/var/www/torodb/stampede/docs/${project.version}</argument>
+                                        <argument>s3://torodb.com/files/var/www/torodb/stampede/docs/${docs.version}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>