From 2c6be54944924d0da07ffc26b9d383e563b4aaa5 Mon Sep 17 00:00:00 2001 From: rabite Date: Mon, 1 Jul 2019 19:25:45 +0200 Subject: put defualt configs in archive (crates.io doesn't allow "?") --- build.rs | 35 +++++++------ config.tar.gz | Bin 0 -> 2235 bytes extra/actions/Add Action?type?name!.sh | 84 -------------------------------- extra/actions/application/extract.sh | 10 ---- extra/actions/compress?archive_name.sh | 3 -- extra/actions/synchtop!.sh | 3 -- extra/actions/text/firefox.sh | 3 -- extra/actions/text/nano!.sh | 3 -- extra/actions/video/mpv.sh | 3 -- extra/actions/youtube_music?url.sh | 15 ------ extra/config | 7 --- extra/hunter_cd.sh | 6 --- extra/previewers/7z | 3 -- extra/previewers/Z | 3 -- extra/previewers/bz | 3 -- extra/previewers/bz2 | 3 -- extra/previewers/cab | 3 -- extra/previewers/cpio | 3 -- extra/previewers/deb | 3 -- extra/previewers/definitions/archive | 3 -- extra/previewers/definitions/html | 6 --- extra/previewers/definitions/openoffice | 3 -- extra/previewers/definitions/pdf | 5 -- extra/previewers/definitions/text | 9 ---- extra/previewers/gz | 3 -- extra/previewers/jar | 3 -- extra/previewers/lha | 3 -- extra/previewers/lzma | 3 -- extra/previewers/lzo | 3 -- extra/previewers/pdf | 5 -- extra/previewers/rar | 3 -- extra/previewers/rpm | 3 -- extra/previewers/tar | 3 -- extra/previewers/xpi | 3 -- extra/previewers/zip | 3 -- 35 files changed, 19 insertions(+), 235 deletions(-) create mode 100644 config.tar.gz delete mode 100755 extra/actions/Add Action?type?name!.sh delete mode 100755 extra/actions/application/extract.sh delete mode 100755 extra/actions/compress?archive_name.sh delete mode 100755 extra/actions/synchtop!.sh delete mode 100755 extra/actions/text/firefox.sh delete mode 100755 extra/actions/text/nano!.sh delete mode 100755 extra/actions/video/mpv.sh delete mode 100755 extra/actions/youtube_music?url.sh delete mode 100644 extra/config delete mode 100644 extra/hunter_cd.sh delete mode 100755 extra/previewers/7z delete mode 100755 extra/previewers/Z delete mode 100755 extra/previewers/bz delete mode 100755 extra/previewers/bz2 delete mode 100755 extra/previewers/cab delete mode 100755 extra/previewers/cpio delete mode 100755 extra/previewers/deb delete mode 100755 extra/previewers/definitions/archive delete mode 100755 extra/previewers/definitions/html delete mode 100755 extra/previewers/definitions/openoffice delete mode 100755 extra/previewers/definitions/pdf delete mode 100755 extra/previewers/definitions/text delete mode 100755 extra/previewers/gz delete mode 100755 extra/previewers/jar delete mode 100755 extra/previewers/lha delete mode 100755 extra/previewers/lzma delete mode 100755 extra/previewers/lzo delete mode 100755 extra/previewers/pdf delete mode 100755 extra/previewers/rar delete mode 100755 extra/previewers/rpm delete mode 100755 extra/previewers/tar delete mode 100755 extra/previewers/xpi delete mode 100755 extra/previewers/zip diff --git a/build.rs b/build.rs index 6134a9c..a69d83a 100644 --- a/build.rs +++ b/build.rs @@ -3,7 +3,7 @@ extern crate rustc_version; use rustc_version::{version_meta, Channel}; -use std::process::Command; +// use std::process::Command; fn main() -> Result<(),()> { @@ -21,21 +21,24 @@ fn main() -> Result<(),()> { return Err(()); } - // rename so we can just extract this into config dir later - Command::new("cp") - .args("-a extra hunter".split(" ")) - .status() - .expect("Can't create copy of extra directory"); - - // create archive that will be included in hunter binary - Command::new("tar") - .args("cfz config.tar.gz hunter".split(" ")) - .status() - .expect("Failed to create archive of defualt config!"); - - // delete directory we just compressed - std::fs::remove_dir_all("hunter") - .expect("Couldn't delete temporary config directory \"hunter\""); + // crates.io doesn't allow question marks in file names + // So we just stuff that in an archive for distribution + + // // rename so we can just extract this into config dir later + // Command::new("cp") + // .args("-a extra hunter".split(" ")) + // .status() + // .expect("Can't create copy of extra directory"); + + // // create archive that will be included in hunter binary + // Command::new("tar") + // .args("cfz config.tar.gz hunter".split(" ")) + // .status() + // .expect("Failed to create archive of defualt config!"); + + // // delete directory we just compressed + // std::fs::remove_dir_all("hunter") + // .expect("Couldn't delete temporary config directory \"hunter\""); return Ok(()); } diff --git a/config.tar.gz b/config.tar.gz new file mode 100644 index 0000000..c81b374 Binary files /dev/null and b/config.tar.gz differ diff --git a/extra/actions/Add Action?type?name!.sh b/extra/actions/Add Action?type?name!.sh deleted file mode 100755 index 6a322bc..0000000 --- a/extra/actions/Add Action?type?name!.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - - -errecho() { - echo ${@} >&2 -} - -check_dir() { - DIR=${1} - - [ -d ${DIR} ] || - mkdir -p ${DIR} || - (echo "Can't create directory: ${DIR}" && exit 1) -} - -populate_file() { - FILE=${1} - - # Don't try to overwrite existing file - test -e ${FILE} && return - - - - cat > ${FILE} << EOF -#!/bin/sh - -# Selected files are stored here -FILES=\${@} - -# You can interate over them one by one -for FILE in \${FILES}; do - echo \$FILE -done - -# Or process them all at once -echo "\${FILES}" -EOF -} - - -## Starting point - -FILE=${1} -MIME=`hunter -m $FILE` -STATUS=$? - - -# MIME detection failed, bail out unless type is base -[ $STATUS != 0 ] && [ $type != "uni" ] && - echo $MIME && - exit 1 - -# Laziy not using XGD here because of OSX -ACTDIR="$HOME/.config/hunter/actions/" - -MIME_BASE=`echo $MIME | cut -d "/" -f 1` -MIME_SUB=`echo $MIME | cut -d "/" -f 2` - - -case $type in - uni) - AFILE="${ACTDIR}/${name}.sh" - check_dir "${ACTDIR}" - populate_file "${AFILE}" - $EDITOR "${AFILE}" - test -e "${AFILE}" && chmod +x "${AFILE}" - ;; - base) - BASEDIR="${ACTDIR}/$MIME_BASE" - AFILE="${BASEDIR}/${name}.sh" - check_dir "${BASEDIR}" - populate_file "${AFILE}" - $EDITOR "${AFILE}" - test -e ${AFILE} && chmod +x "${ACTDIR}/$name" - ;; - sub) - SUBDIR="${ACTDIR}/${MIME_BASE}/${MIME_SUB}" - AFILE="${SUBDIR}/${name}.sh" - check_dir ${SUBDIR} - populate_file "${AFILE}" - $EDITOR "${AFILE}" - test -e ${AFILE} && chmod+ +x ${AFILE} - ;; -esac diff --git a/extra/actions/application/extract.sh b/extra/actions/application/extract.sh deleted file mode 100755 index 51c8c0f..0000000 --- a/extra/actions/application/extract.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -which 7z >/dev/null && EXTRACTOR="7z x" -# Prefer aunpack -which aunpack >/dev/null && EXTRACTOR=aunpack - - -for file in "$@"; do - echo $EXTRACTOR "$file"; -done diff --git a/extra/actions/compress?archive_name.sh b/extra/actions/compress?archive_name.sh deleted file mode 100755 index 17c0d6a..0000000 --- a/extra/actions/compress?archive_name.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z a $archive_name "$@" diff --git a/extra/actions/synchtop!.sh b/extra/actions/synchtop!.sh deleted file mode 100755 index 5e1f9f7..0000000 --- a/extra/actions/synchtop!.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec htop diff --git a/extra/actions/text/firefox.sh b/extra/actions/text/firefox.sh deleted file mode 100755 index a03ee81..0000000 --- a/extra/actions/text/firefox.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -firefox "$@" diff --git a/extra/actions/text/nano!.sh b/extra/actions/text/nano!.sh deleted file mode 100755 index 2b03d6c..0000000 --- a/extra/actions/text/nano!.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -nano "$@" diff --git a/extra/actions/video/mpv.sh b/extra/actions/video/mpv.sh deleted file mode 100755 index 87da718..0000000 --- a/extra/actions/video/mpv.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec mpv "$@" diff --git a/extra/actions/youtube_music?url.sh b/extra/actions/youtube_music?url.sh deleted file mode 100755 index 8881499..0000000 --- a/extra/actions/youtube_music?url.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -FORMATS=`youtube-dl -F "$url"` - -echo $FORMATS - -echo $FORMATS | grep "251 " && - youtube-dl -x -f 251 "$url" && - exit 0 - -echo $FORMATS | grep "171 " && - youtube-dl -x -f 171 "$url" && - exit 0 - -exit 1 diff --git a/extra/config b/extra/config deleted file mode 100644 index c36e505..0000000 --- a/extra/config +++ /dev/null @@ -1,7 +0,0 @@ -animation=on -show_hidden=off -select_cmd=find -type f | fzf -m -cd_cmd=find -type d | fzf -icons=off -media_autostart=off -media_mute=off diff --git a/extra/hunter_cd.sh b/extra/hunter_cd.sh deleted file mode 100644 index 6d73be1..0000000 --- a/extra/hunter_cd.sh +++ /dev/null @@ -1,6 +0,0 @@ -function hunter() { - env hunter - test -e ~/.hunter_cwd && - source ~/.hunter_cwd && - rm ~/.hunter_cwd && cd $HUNTER_CWD -} diff --git a/extra/previewers/7z b/extra/previewers/7z deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/7z +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/Z b/extra/previewers/Z deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/Z +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/bz b/extra/previewers/bz deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/bz +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/bz2 b/extra/previewers/bz2 deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/bz2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/cab b/extra/previewers/cab deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/cab +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/cpio b/extra/previewers/cpio deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/cpio +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/deb b/extra/previewers/deb deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/deb +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/definitions/archive b/extra/previewers/definitions/archive deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/definitions/archive +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/definitions/html b/extra/previewers/definitions/html deleted file mode 100755 index 0f5e48a..0000000 --- a/extra/previewers/definitions/html +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -w3m -dump "${1}" || -links -dump "${1}" || -elinks -dump "${1}" || -lynx -dump "${1}" \ No newline at end of file diff --git a/extra/previewers/definitions/openoffice b/extra/previewers/definitions/openoffice deleted file mode 100755 index 91e56b0..0000000 --- a/extra/previewers/definitions/openoffice +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -odt2text "${1}" 2> /dev/null \ No newline at end of file diff --git a/extra/previewers/definitions/pdf b/extra/previewers/definitions/pdf deleted file mode 100755 index 162edba..0000000 --- a/extra/previewers/definitions/pdf +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -pdftotext -l 10 -layout -nopgbrk -q "${1}" -|| -mutool draw -F txt -i -- "${1}" || -exiftool "${1}" 2> /dev/null diff --git a/extra/previewers/definitions/text b/extra/previewers/definitions/text deleted file mode 100755 index e76f920..0000000 --- a/extra/previewers/definitions/text +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -bat --plain --color=always --paging=never "${1}" --line-range 1:100 --tabs 8 -2>/dev/null && exit 5 - -highlight --replace-tabs=4 --force -- "${1}" -2>/dev/null && exit 5 - -cat "${1}" diff --git a/extra/previewers/gz b/extra/previewers/gz deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/gz +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/jar b/extra/previewers/jar deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/jar +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/lha b/extra/previewers/lha deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/lha +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/lzma b/extra/previewers/lzma deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/lzma +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/lzo b/extra/previewers/lzo deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/lzo +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/pdf b/extra/previewers/pdf deleted file mode 100755 index 162edba..0000000 --- a/extra/previewers/pdf +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -pdftotext -l 10 -layout -nopgbrk -q "${1}" -|| -mutool draw -F txt -i -- "${1}" || -exiftool "${1}" 2> /dev/null diff --git a/extra/previewers/rar b/extra/previewers/rar deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/rar +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/rpm b/extra/previewers/rpm deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/rpm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/tar b/extra/previewers/tar deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/tar +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/xpi b/extra/previewers/xpi deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/xpi +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" diff --git a/extra/previewers/zip b/extra/previewers/zip deleted file mode 100755 index 25ee10d..0000000 --- a/extra/previewers/zip +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -7z l -p -- "${1}" -- cgit v1.2.3