bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Remove deburl and boardurl options to simplify usage and documentations

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-13 10:08:55 -04:00
parent 0114e6af2c
commit c6b36b06b2
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
installJRMC
View File

@@ -54,10 +54,6 @@ OPTIONS
Build or install a specific version (Default: scrape the latest version from Interact) Build or install a specific version (Default: scrape the latest version from Interact)
--restorefile RESTOREFILE --restorefile RESTOREFILE
Restore file location for registration (Default: skip registration) Restore file location for registration (Default: skip registration)
--boardurl URL
Interact board url to scrape for latest version number (Default: see DEFAULTS)
--deburl URL
Specify URL to source DEB package (Default: automatic)
--betapass PASSWORD --betapass PASSWORD
Enter beta team password for access to beta builds Enter beta team password for access to beta builds
--service SERVICE --service SERVICE
@@ -107,7 +103,7 @@ EOF
_parseInput () { _parseInput () {
if _input=$(getopt -o +vdhu -l rpmbuild,outputdir:,mcversion:,restorefile:,boardurl:,deburl:,betapass:,service:,version,debug,help,uninstall,createrepo,createrepo-webroot:,createrepo-user:,vncpass:,display: -- "$@"); then if _input=$(getopt -o +vdhu -l rpmbuild,outputdir:,mcversion:,restorefile:,betapass:,service:,version,debug,help,uninstall,createrepo,createrepo-webroot:,createrepo-user:,vncpass:,display: -- "$@"); then
eval set -- "$_input" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
@@ -123,12 +119,6 @@ EOF
--restorefile) --restorefile)
shift && _restorefile="$1" shift && _restorefile="$1"
;; ;;
--boardurl)
shift && _boardurl="$1"
;;
--deburl)
shift && _deburl="$1"
;;
--betapass) --betapass)
shift && _betapass="$1" shift && _betapass="$1"
;; ;;
@@ -396,15 +386,8 @@ EOF'
# If necessary, create SOURCES dir # If necessary, create SOURCES dir
[[ ! -d "$_outputdir/SOURCES" ]] && mkdir -p "$_outputdir/SOURCES" [[ ! -d "$_outputdir/SOURCES" ]] && mkdir -p "$_outputdir/SOURCES"
# if $_deburl is set, try it first and overwrite local files
if [[ -n "$_deburl" ]]; then
if wget -q -O "$_outputdir/SOURCES/MediaCenter-${_mcversion}-amd64.deb" "$_deburl"; then
true
else
echo "Your --deburl is broken, trying automatic download instead"
fi
# If deb file already exists, skip download # If deb file already exists, skip download
elif [[ -f "$_outputdir/SOURCES/MediaCenter-${_mcversion}-amd64.deb" ]]; then if [[ -f "$_outputdir/SOURCES/MediaCenter-${_mcversion}-amd64.deb" ]]; then
echo "Using local DEB file: $_outputdir/SOURCES/MediaCenter-${_mcversion}-amd64.deb" echo "Using local DEB file: $_outputdir/SOURCES/MediaCenter-${_mcversion}-amd64.deb"
# Else check beta repo # Else check beta repo
elif [[ -n $_betapass ]]; then elif [[ -n $_betapass ]]; then