julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #118 from Ornias1993/fix_master

Browse Source 
Emergency master fix due to move
This commit is contained in:
Kjeld Schouten-Lebbing 2020-05-24 23:07:54 +02:00 committed by GitHub
commit 676f32b1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -1 +0,0 @@

4
docs/Readme.md
View File

@ -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 ## Intro
@ -19,7 +19,7 @@ The goal of this project is to be able to install, update, reinstall, upgrade an
### Installing ### Installing
- Get into FreeNAS using the in-gui console or SSH. - Get into FreeNAS using the in-gui console or SSH.
Run the following commands to install jailman: 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` - `cd jailman`
- `cp config.yml.example config.yml` - `cp config.yml.example config.yml`
- edit config.yml to reflect your personal settings (optional, see "use") - edit config.yml to reflect your personal settings (optional, see "use")

5
global.sh
View File

@ -24,10 +24,11 @@ parse_yaml() {
# automatic update function # automatic update function
gitupdate() { gitupdate() {
git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
echo "checking for updates using Branch: $1" echo "checking for updates using Branch: $1"
git fetch git fetch upstream
git update-index -q --refresh git update-index -q --refresh
CHANGED=$(git diff --name-only origin/"$1") CHANGED=$(git diff --name-only "$1")
if [ -n "$CHANGED" ]; if [ -n "$CHANGED" ];
then then
echo "script requires update" echo "script requires update"

2
jailman.sh
View File

@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
fi fi
# Auto Update # Auto Update
BRANCH="master" BRANCH="upstream/master"
gitupdate ${BRANCH} gitupdate ${BRANCH}
# If no option is given, point to the help menu # If no option is given, point to the help menu