Merge pull request #118 from Ornias1993/fix_master
Emergency master fix due to move
This commit is contained in:
commit
676f32b1ce
@ -1 +0,0 @@
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
---
|
||||
|
||||
[![GitHub last commit](https://img.shields.io/github/last-commit/ornias1993/jailman/dev.svg)](https://github.com/ornias1993/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/ornias1993/jailman.svg)](https://github.com/ornias1993/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.BSD2)
|
||||
[![GitHub last commit](https://img.shields.io/github/last-commit/jailmanager/jailman/dev.svg)](https://github.com/jailmanager/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/jailmanager/jailman.svg)](https://github.com/jailmanager/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.BSD2)
|
||||
|
||||
## Intro
|
||||
|
||||
@ -19,7 +19,7 @@ The goal of this project is to be able to install, update, reinstall, upgrade an
|
||||
### Installing
|
||||
- Get into FreeNAS using the in-gui console or SSH.
|
||||
Run the following commands to install jailman:
|
||||
- `git clone https://github.com/Ornias1993/jailman.git`
|
||||
- `git clone https://github.com/jailmanager/jailman.git`
|
||||
- `cd jailman`
|
||||
- `cp config.yml.example config.yml`
|
||||
- edit config.yml to reflect your personal settings (optional, see "use")
|
||||
|
@ -24,10 +24,11 @@ parse_yaml() {
|
||||
|
||||
# automatic update function
|
||||
gitupdate() {
|
||||
git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
|
||||
echo "checking for updates using Branch: $1"
|
||||
git fetch
|
||||
git fetch upstream
|
||||
git update-index -q --refresh
|
||||
CHANGED=$(git diff --name-only origin/"$1")
|
||||
CHANGED=$(git diff --name-only "$1")
|
||||
if [ -n "$CHANGED" ];
|
||||
then
|
||||
echo "script requires update"
|
||||
|
@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
|
||||
fi
|
||||
|
||||
# Auto Update
|
||||
BRANCH="master"
|
||||
BRANCH="upstream/master"
|
||||
gitupdate ${BRANCH}
|
||||
|
||||
# If no option is given, point to the help menu
|
||||
|
Loading…
Reference in New Issue
Block a user