From 1f87dd79a66138a196c1ebf4546881fb9068c00c Mon Sep 17 00:00:00 2001 From: Christopher James Hayward Date: Sun, 24 Apr 2022 14:40:35 -0400 Subject: [PATCH] Use ; instead of && in case of failure --- README.org | 5 +++-- flake.nix | 3 ++- modules/hugo.nix | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.org b/README.org index 4bfb85f..7bb4fc1 100644 --- a/README.org +++ b/README.org @@ -111,7 +111,8 @@ RUN nix-shell /etc/dotfiles/shell.nix description = "<>"; inputs = { - <> + <> + flake-utils.url = "github:numtide/flake-utils"; <> <> <> @@ -718,7 +719,7 @@ let mySiteDir = "/etc/dotfiles/docs/public/"; mySiteTgt = "ubuntu@chrishayward.xyz:/var/www/wedding"; mySiteBuild = pkgs.writeShellScriptBin "my-site-build" '' - pushd ${mySiteDir}../ && ${pkgs.hugo}/bin/hugo -v && popd + pushd ${mySiteDir}../ && ${pkgs.hugo}/bin/hugo -v ; popd ''; mySiteUpdate = pkgs.writeShellScriptBin "my-site-update" '' ${pkgs.rsync}/bin/rsync -aP ${mySiteDir} ${mySiteTgt} diff --git a/flake.nix b/flake.nix index db9ed42..0b7af8a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,8 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-unstable.url = "nixpkgs/master"; + nixpkgs-unstable.url = "nixpkgs/master"; + flake-utils.url = "github:numtide/flake-utils"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.url = "github:nix-community/emacs-overlay"; diff --git a/modules/hugo.nix b/modules/hugo.nix index 529cec8..eca6f75 100644 --- a/modules/hugo.nix +++ b/modules/hugo.nix @@ -5,7 +5,7 @@ let mySiteDir = "/etc/dotfiles/docs/public/"; mySiteTgt = "ubuntu@chrishayward.xyz:/var/www/wedding"; mySiteBuild = pkgs.writeShellScriptBin "my-site-build" '' - pushd ${mySiteDir}../ && ${pkgs.hugo}/bin/hugo -v && popd + pushd ${mySiteDir}../ && ${pkgs.hugo}/bin/hugo -v ; popd ''; mySiteUpdate = pkgs.writeShellScriptBin "my-site-update" '' ${pkgs.rsync}/bin/rsync -aP ${mySiteDir} ${mySiteTgt}