diff --git a/CHANGELOG.md b/CHANGELOG.md index 20bb40c..e6a67e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ - [S] release are always compared to the previous [S] release. +## Version 1.4.2 (2016-05-18) [S] + - [FIX]: Password verification not implemented in RCC login page + ## Version 1.4.1 (2016-05-18) [S] - Switch to HTTP Basic Auth for the RCC API - Store password as hash diff --git a/package.json b/package.json index 6765a59..60f926b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rangitaki", - "version": "1.4.1", + "version": "1.4.2", "description": "A simple PHP blogging engine without any database dependencies", "main": "index.php", "scripts": { diff --git a/rcc/index.php b/rcc/index.php index 4dfe5d8..3dd445d 100644 --- a/rcc/index.php +++ b/rcc/index.php @@ -106,7 +106,7 @@ if ($config["rcc"]["rcc"] == "on") { diff --git a/update-scripts/1-4-1_1-4-2.sh b/update-scripts/1-4-1_1-4-2.sh new file mode 100755 index 0000000..55af9e5 --- /dev/null +++ b/update-scripts/1-4-1_1-4-2.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# Update script for Rangitaki from version 1.4.0 to 1.4.1 + +version="1.4.2" +new="./rbe-new" + +echo -n "Downloading version $version from GitLab... " +git clone -q https://gitlab.com/mmk2410/rangitaki.git "$new" + +if [[ $1 == "--debug" ]]; then + cd $new + git checkout master + cd ../ +fi +echo "done" + +echo -n "Updating RCC... " +mv ./rcc/password.php ./ +rm -rf ./rcc +mv $new/rcc ./ +rm ./rcc/password.php +mv ./password.php ./rcc/ +echo "done" + +echo -n "Updating Changelog... " + +if [ -f ./CHANGELOG.txt ]; then + rm CHANGELOG.txt +fi + +mv $new/CHANGELOG.md ./ +echo "done" + +if [[ $1 != "--debug" ]]; then + echo -n "Cleaning up... " + rm -rf $new + echo "done" +fi + +if [ -d "./update-scripts" ]; then + echo -n "Remove obsolete update scripts folder... " + rm -rf "./update-scripts" + echo "done" +fi + +echo "$version" > ./VERSION + +echo "Your Rangitaki installation is updated to version $version"