From 6a4707c46f5b20b547ccc6871edc3689a59b607d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Fri, 15 Jan 2021 10:17:33 +0100 Subject: [PATCH] fixes --- skyscraper.sh | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/skyscraper.sh b/skyscraper.sh index 1426a08..fa3683e 100755 --- a/skyscraper.sh +++ b/skyscraper.sh @@ -1,21 +1,28 @@ #!/bin/bash readonly USAGE=" USAGE: -$(basename "$0") [BUILD or SCRAP] [PATH]" +$(basename "$0") [BUILD or SCRAP] [FRONTEND] [PATH]" function help_message() { echo "$USAGE" echo - echo "Where [SYSTEM] are:" - for WORD in $SYSTEMS; do + echo "Where [FRONTEND] are:" + for WORD in $FRONTENDS; do echo -e "\t$WORD" done } -SYSTEMS="apple2 arcade atari2600 atari7800 atarilynx coleco gamegear gb gba gbc mastersystem megadrive msx n64 nes ngpc pcengine sega32x sg1000 snes vectrex virtualboy wonderswan wonderswancolor" +FRONTENDS="emulationstation pegasus" # check if there are all the parameters -if [ "$#" -ne 2 ]; then +if [ "$#" -ne 3 ]; then + help_message + exit 0 +fi + +# check if the frontend parameter is valid +if ! echo "$FRONTENDS" | grep -w "$2" >/dev/null; then + printf "%s\n" "You must enter a valid FRONTEND name." help_message exit 0 fi @@ -40,14 +47,15 @@ readonly COLOR_BACKGROUND_RED=$(tput setab 1) readonly RESET_COLOR=$(tput sgr0) #readonly SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -readonly ROM_DIR="$2" +readonly FRONTEND="$2" +readonly ROM_DIR="$3" readonly CONSOLE_ART=artwork.xml.screenshot readonly CONSOLECD_ART=artwork.xml.cover readonly ARCADE_ART=artwork.xml.wheel readonly CONSOLE_SCRAPERS="screenscrapER mobygames thegamesdb" readonly ARCADE_SCRAPERS="screenacraper arcadedb" -readonly SCRAP=true -readonly BUILD=true +SCRAP=true +BUILD=true if [ "$1" = SCRAP ]; then BUILD=false @@ -72,7 +80,7 @@ for SYSTEM in $CONSOLE; do done fi if [ "$BUILD" = true ]; then - Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos -a $CONSOLE_ART -p "$SYSTEM" + Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos -a $CONSOLE_ART -p "$SYSTEM" -f "${FRONTEND}" #Skyscraper --flags videos,unattend,relative,skipexistingvideos -a $CONSOLE_ART -p $i fi done @@ -90,7 +98,7 @@ for SYSTEM in $CONSOLECD; do done fi if [ "$BUILD" = true ]; then - Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "$SYSTEM" + Skyscraper --flags videos,unattend,forcefilename,relative,skipexistingvideos,nobrackets -a $CONSOLECD_ART -p "$SYSTEM" -f "${FRONTEND}" fi done @@ -102,12 +110,12 @@ arcade="fba neogeo mame-advmame mame-mame4all" # fba neogeo mame-advmame mame-mame4all for SYSTEM in $arcade; do if [ "$SCRAP" = true ]; then - for SCRAPper in $ARCADE_SCRAPERS; do - Skyscraper --flags videos,unattend,noresize -p "$SYSTEM" -s "$SCRAPper" + for SCRAPER in $ARCADE_SCRAPERS; do + Skyscraper --flags videos,unattend,noresize -p "$SYSTEM" -s "$SCRAPER" done fi if [ "$BUILD" = true ]; then - Skyscraper --flags videos,unattend,relative,skipexistingvideos,nobrackets -a $ARCADE_ART -p "$SYSTEM" + Skyscraper --flags videos,unattend,relative,skipexistingvideos,nobrackets -a $ARCADE_ART -p "$SYSTEM" -f "${FRONTEND}" fi done