diff --git a/bin/bootstrap.php b/bin/bootstrap.php index bf90aa0..19d12bc 100644 --- a/bin/bootstrap.php +++ b/bin/bootstrap.php @@ -1,6 +1,6 @@ 1) { + $git = array_slice($git,0,2); +} +$git = join(".",$git); + +echo "APP_VERSION={$git}\n"; diff --git a/composer.json b/composer.json index 78d2a10..d48eb2a 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "symfony/console": "^3.0", "symfony/yaml": "^3.0", "noccylabs/downloader": "@dev", - "symfony/expression-language": "^3.2" + "symfony/expression-language": "^3.2", + "noccylabs/tinyphar": "^0.1.1" } } diff --git a/installer/install.sh b/installer/install.sh index 96a770a..3aa15dc 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -1,5 +1,10 @@ #!/bin/bash +if [ ! -d ~/bin ]; then + echo "Creating ~/bin..." + mkdir ~/bin +fi + echo "Installing hotfix executable..." cp hotfix ~/bin/hotfix echo "Fixing permissions..." diff --git a/installer/message b/installer/message index 4342f12..c2e4a32 100644 --- a/installer/message +++ b/installer/message @@ -1,5 +1,11 @@ -This installer will put hotfix into the bin directory of the current user, ie. install it as ~/bin/hotfix. If the directory does not exist, it will be created. - -Most Linux distributions will automatically add ~/bin to the path if it exists. If hotfix isn't callable from the command line after restarting your shell and/or rebooting, please consult the documentation. +This will install hotfix into the bin directory of the current user (as ~/bin/hotfix). If +the directory does not exist, it will be created. Most Linux distributions will add the +~/bin directory to the path if it is found. If hotfix isn't callable from the command line +after restarting your shell and/or rebooting, please consult the documentation. Some basic aliases will be installed into ~/.hotfix.conf if the file doesn't already exist. +Just remember to import the keys of the publishers whose hotfixes you are applying! + + + +This installer was created on %{installer.date}