mirror of
https://github.com/webinstall/webi-installers.git
synced 2026-02-14 17:49:53 +00:00
fix(ffuf): fix version command, and package path for Windows
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
$pkg_cmd_name = "ffuf"
|
||||
|
||||
$pkg_dst_cmd = "$Env:USERPROFILE\.local\bin\ffuf.exe"
|
||||
$pkg_dst_bin = "$Env:USERPROFILE\.local\bin\"
|
||||
$pkg_dst = "$pkg_dst_cmd"
|
||||
|
||||
$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\ffuf-v$Env:WEBI_VERSION\bin\ffuf.exe"
|
||||
@@ -19,14 +20,14 @@ New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | out-null
|
||||
$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
|
||||
|
||||
# Fetch archive
|
||||
IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"))
|
||||
IF (-Not (Test-Path -Path "$pkg_download"))
|
||||
{
|
||||
echo "Downloading ffuf from $Env:WEBI_PKG_URL to $pkg_download"
|
||||
& curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
|
||||
& move "$pkg_download.part" "$pkg_download"
|
||||
}
|
||||
|
||||
IF (!(Test-Path -Path "$pkg_src_cmd"))
|
||||
IF (-Not (Test-Path -Path "$pkg_src_cmd"))
|
||||
{
|
||||
echo "Installing ffuf"
|
||||
|
||||
@@ -50,7 +51,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd"))
|
||||
# Settle unpacked archive into place
|
||||
echo "Install Location: $pkg_src_cmd"
|
||||
New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
|
||||
Move-Item -Path ".\ffuf\ffuf.exe" -Destination "$pkg_src_bin"
|
||||
Move-Item -Path ".\ffuf.exe" -Destination "$pkg_src_bin"
|
||||
|
||||
# Exit tmp
|
||||
popd
|
||||
@@ -58,4 +59,5 @@ IF (!(Test-Path -Path "$pkg_src_cmd"))
|
||||
|
||||
echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
|
||||
Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
|
||||
New-Item "$pkg_dst_bin" -ItemType Directory -Force | out-null
|
||||
Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
|
||||
|
||||
@@ -7,9 +7,9 @@ __init_ffuf() {
|
||||
set -e
|
||||
set -u
|
||||
|
||||
##################
|
||||
################
|
||||
# Install ffuf #
|
||||
##################
|
||||
################
|
||||
|
||||
# Every package should define these 6 variables
|
||||
pkg_cmd_name="ffuf"
|
||||
@@ -23,22 +23,22 @@ __init_ffuf() {
|
||||
|
||||
# pkg_install must be defined by every package
|
||||
pkg_install() {
|
||||
# ~/.local/opt/ffuf-v0.99.9/bin
|
||||
# ~/.local/opt/ffuf-v2.1.0/bin
|
||||
mkdir -p "$(dirname "${pkg_src_cmd}")"
|
||||
|
||||
# mv ./ffuf-*/ffuf ~/.local/opt/ffuf-v0.99.9/bin/ffuf
|
||||
# mv ./ffuf-*/ffuf ~/.local/opt/ffuf-v2.1.0/bin/ffuf
|
||||
mv ./ffuf "$pkg_src_cmd"
|
||||
}
|
||||
|
||||
# pkg_get_current_version is recommended, but not required
|
||||
pkg_get_current_version() {
|
||||
# 'ffuf --version' has output in this format:
|
||||
# ffuf 0.99.9 (rev abcdef0123)
|
||||
# 'ffuf -V' has output in this format:
|
||||
# ffuf version: 2.1.0
|
||||
# This trims it down to just the version number:
|
||||
# 0.99.9
|
||||
ffuf --version 2> /dev/null |
|
||||
# 2.1.0
|
||||
ffuf -V 2> /dev/null |
|
||||
head -n 1 |
|
||||
cut -d ' ' -f 2
|
||||
cut -d' ' -f3
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user