diff --git a/Makefile b/Makefile index 2b2731fd44..b6cd26ad0a 100644 --- a/Makefile +++ b/Makefile @@ -401,14 +401,12 @@ install: $(TARGET) install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR) install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR) - install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/retroarch rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig rm -f $(DESTDIR)$(PREFIX)/bin/retrolaunch - rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-zip rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1 diff --git a/retroarch-zip b/retroarch-zip deleted file mode 100755 index 18cf542d67..0000000000 --- a/retroarch-zip +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -### -## Wrapper script that enables loading of compressed roms for RetroArch. -## Author: Themaister -## License: Do whatever you want with it. -# - -die() -{ - echo "Error: $1" - rm -r "${TMPDIR}" - exit 1 -} - -if [ -z "$1" ]; then - die "Need at least one argument" -fi - -COMP_FILE="$1" -TMPDIR="`mktemp -d /tmp/retroarch-XXXXXX`" -shift - -extract_zip() -{ - which unzip >/dev/null 2>&1 || die "Cannot find unzip" - unzip "$1" -d "${TMPDIR}" >/dev/null 2>&1 || die "Couldn't extract from archive" -} - -extract_7z() -{ - which 7z >/dev/null 2>&1 || die "Cannot find 7z" - 7z x "$1" -o"${TMPDIR}" >/dev/null 2>&1 || die "Couldn't extract from archive" -} - -extract_rar() -{ - which unrar >/dev/null 2>&1 || die "Cannot find unrar" - unrar x "$1" "${TMPDIR}" >/dev/null 2>&1 || die "Couldn't extract from archive" -} - -case "${COMP_FILE}" in - *.zip ) - extract_zip "${COMP_FILE}" - EXTENSION=".zip" - ;; - *.7z ) - extract_7z "${COMP_FILE}" - EXTENSION=".7z" - ;; - *.rar ) - extract_rar "${COMP_FILE}" - EXTENSION=".rar" - ;; - * ) - die "Couldn't find valid zipped rom." - ;; -esac - -# pick the largest non-directory in the root of the unpacked archive -FILENAME="`ls -Sp \"${TMPDIR}\" | grep -v /$ | head -n1`" -if [ -z "${FILENAME}" ]; then - die "Cannot find any files in root of archive" -fi - -SAVENAME="`basename \"${COMP_FILE}\" ${EXTENSION}`" -SAVESTATE="`basename \"${COMP_FILE}\" ${EXTENSION}`" -DIRNAME="`dirname \"${COMP_FILE}\"`" -SAVENAME="${SAVENAME}.srm" -SAVESTATE="${SAVESTATE}.state" - -EXE="`which retroarch`" -if [ -z "${EXE}" ]; then - die "Cannot find RetroArch in path." -fi - -echo "Temp ROM: ${TMPDIR}/${FILENAME}" -echo "Savename: ${DIRNAME}/${SAVENAME}" -echo "Savestate: ${DIRNAME}/${SAVESTATE}" -"${EXE}" "${TMPDIR}/${FILENAME}" -s "${DIRNAME}/${SAVENAME}" -S "${DIRNAME}/${SAVESTATE}" "$@" -rm -r "${TMPDIR}" -