From 9483212dba0934c9d38a8c7c83def4d13d6eb7c3 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 24 May 2020 23:00:59 +0200 Subject: [PATCH 1/3] gitfix --- global.sh | 5 +++-- jailman.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/global.sh b/global.sh index 262a72f3..b22fbff5 100755 --- a/global.sh +++ b/global.sh @@ -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" diff --git a/jailman.sh b/jailman.sh index 511cb148..f9b570ed 100755 --- a/jailman.sh +++ b/jailman.sh @@ -20,13 +20,13 @@ 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 if [ $# -eq 0 ] then - echo "Missing options!" +echo "Missing options!" echo "(run $0 -h for help)" echo "" exit 0 From 61af3c2e7d6b38ad0e28610d188081913f85057d Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 24 May 2020 23:01:54 +0200 Subject: [PATCH 2/3] change readme references --- docs/Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Readme.md b/docs/Readme.md index ca567794..96882269 100644 --- a/docs/Readme.md +++ b/docs/Readme.md @@ -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") From 1b662fdff50e7f6f3d4a6f7866050bdb9b07520e Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 24 May 2020 23:04:35 +0200 Subject: [PATCH 3/3] remove cirrus ci --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 8b137891..00000000 --- a/.cirrus.yml +++ /dev/null @@ -1 +0,0 @@ -