Browse Source

Use ; instead of && in case of failure

main
parent
commit
1f87dd79a6
Signed by: chris GPG Key ID: 3025DCBD46F81C0F
  1. 5
      README.org
  2. 3
      flake.nix
  3. 2
      modules/hugo.nix

5
README.org

@ -111,7 +111,8 @@ RUN nix-shell /etc/dotfiles/shell.nix
description = "<<description>>";
inputs = {
<<os-nixpkgs>>
<<os-nixpkgs>>
flake-utils.url = "github:numtide/flake-utils";
<<os-home-manager>>
<<os-emacs-overlay>>
<<os-nixos-hardware>>
@ -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}

3
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";

2
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}

Loading…
Cancel
Save