bitwarden #43

Merged
sid merged 3 commits from develop into release-25.11 2026-05-18 16:39:54 +02:00
2 changed files with 11 additions and 4 deletions
Showing only changes of commit fd68579042 - Show all commits

View file

@ -2,6 +2,8 @@
stdenv, stdenv,
lib, lib,
makeWrapper, makeWrapper,
pass,
pass2csv,
python3, python3,
... ...
}: }:
@ -20,13 +22,18 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
sed -e "s|python ./convert_csvs.py|python $out/bin/convert_csvs.py|" \ cp ${src}/pass2bw.sh $out/bin/${pname}
${src}/${pname}.sh > $out/bin/${pname}
chmod +x $out/bin/${pname} chmod +x $out/bin/${pname}
cp ${src}/convert_csvs.py $out/bin/ cp ${src}/convert_csvs.py $out/bin/
wrapProgram $out/bin/${pname} \ wrapProgram $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ python3 ]} --prefix PATH : ${
lib.makeBinPath [
pass
pass2csv
python3
]
}
''; '';
} }

View file

@ -4,5 +4,5 @@ if [ "$#" -ne 2 ]; then
fi fi
pass2csv "$1" /tmp/pass.csv pass2csv "$1" /tmp/pass.csv
python ./convert_csvs.py /tmp/pass.csv "$2" python3 "$(dirname "$0")/convert_csvs.py" /tmp/pass.csv "$2"
rm /tmp/pass.csv rm /tmp/pass.csv