diff --git a/qzsec/access-client/access-client b/qzsec/access-client/access-client index a0e8fbf..e37ca3c 100644 --- a/qzsec/access-client/access-client +++ b/qzsec/access-client/access-client @@ -39,10 +39,7 @@ elif [ "$APP" == "filezilla" ]; then PORT_NUM=$(echo $ARGS | jq -r .Port) USERNAME=$(echo $ARGS | jq -r .User) PASSWORD=$(echo $ARGS | jq -r .PWD) - - filebinary=$(which org.filezillaproject.Filezilla || which filezilla ) - - "$filebinary" "sftp://$USERNAME:$PASSWORD@$HOSTNAME:$PORT_NUM" + filezilla "sftp://$USERNAME:$PASSWORD@$HOSTNAME:$PORT_NUM" else echo "Unsupported app." sleep 5 diff --git a/qzsec/access-client/package.nix b/qzsec/access-client/package.nix index 31ca058..6462143 100644 --- a/qzsec/access-client/package.nix +++ b/qzsec/access-client/package.nix @@ -8,6 +8,7 @@ openssh, which, xdg-terminal-exec, + filezilla, ... }: let @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { coreutils openssh xdg-terminal-exec + filezilla + which ]; nativeBuildInputs = [ @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - sed "/^export PATH=/s|@PATH|${coreutils}/bin:${jq}/bin:${passh}/bin:${zlib-ng.bin}/bin:${openssh}/bin:${xdg-terminal-exec}/bin|" "${bin}" > $out/bin/${pname} + sed "/^export PATH=/s|@PATH|${which}/bin:${coreutils}/bin:${jq}/bin:${passh}/bin:${zlib-ng.bin}/bin:${openssh}/bin:${xdg-terminal-exec}/bin:${filezilla}/bin|" "${bin}" > $out/bin/${pname} chmod +x $out/bin/${pname} mkdir -p $out/share/applications cat "${desktop}" | sed "/^Exec=/s|@EXEC|$out/bin/${pname}|" > "$out/share/applications/${pname}.desktop" echo "PATH: $PATH" - which jq && which minideflate && which passh && which ssh && which xdg-terminal-exec || exit 1 + which which && which jq && which minideflate && which passh && which ssh && which xdg-terminal-exec || exit 1 ''; }