diff --git a/_scripts/format_handovers.sh b/_scripts/format_handovers.sh index c14ae01..6dfae88 100755 --- a/_scripts/format_handovers.sh +++ b/_scripts/format_handovers.sh @@ -36,7 +36,7 @@ for d in */ ; do echo "$out_folder/$stripped.pdf" # convert teh html to pdf - wkhtmltopdf -q --enable-local-file-access --no-stop-slow-scripts "$stripped.html" "$out_folder/$stripped.pdf" 2> ./tmp.txt + puppeteer print "$stripped.html" "$out_folder/$stripped.pdf" 2> ./tmp.txt fi done done diff --git a/_scripts/format_minutes.sh b/_scripts/format_minutes.sh index 67757ce..47c5c5b 100755 --- a/_scripts/format_minutes.sh +++ b/_scripts/format_minutes.sh @@ -39,7 +39,7 @@ for year in */ ; do echo $output - wkhtmltopdf -q --enable-local-file-access --no-stop-slow-scripts "$stripped.html" "$output" 2>> ../errors.log + puppeteer print "$stripped.html" "$output" 2>> ../errors.log fi done diff --git a/flake.nix b/flake.nix index ee6b913..b3d7af5 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,6 @@ permittedInsecurePackages = [ # for obsidian "electron-25.9.0" - # for wkhtmltopdf - "qtwebkit-5.212.0-alpha4" ]; }; }; @@ -49,12 +47,12 @@ packages = { handovers = pkgs.writeShellScriptBin "format_handovers" '' - export PATH=${pkgs.lib.makeBinPath [pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux]}:$PATH + export PATH=${pkgs.lib.makeBinPath [pkgs.puppeteer-cli bfom.defaultPackage.x86_64-linux]}:$PATH ${./_scripts/format_handovers.sh} ''; minutes = pkgs.writeShellScriptBin "format_minutes" '' - export PATH=${pkgs.lib.makeBinPath [pkgs.wkhtmltopdf bfom.defaultPackage.x86_64-linux]}:$PATH + export PATH=${pkgs.lib.makeBinPath [pkgs.puppeteer-cli bfom.defaultPackage.x86_64-linux]}:$PATH ${./_scripts/format_minutes.sh} ''; };