diff options
author | toonn <toonn@toonn.io> | 2022-03-31 12:45:33 +0200 |
---|---|---|
committer | toonn <toonn@toonn.io> | 2022-03-31 12:47:54 +0200 |
commit | 30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de (patch) | |
tree | aa1997ad11337c0f950e1a0aab92b590c4af80f7 /pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | |
parent | 7ef15c96dc6180295d46efb0a0a4f1dd5b0b687a (diff) | |
download | nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar.gz nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar.bz2 nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar.lz nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar.xz nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.tar.zst nixpkgs-30e8e0a9a3b11e06f0aed76e25ae5fdd73f833de.zip |
desktopToDarwinBundle: Change empty directory test
`ls -1 "$iconsdir/"*` listed the source directory for me when the glob had no matches. Switching to `-A` circumvents this problem and has the added advantage that it cannot run into argument list length limits.
Diffstat (limited to 'pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh')
-rw-r--r-- | pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5bd71764c61..b1364db0610 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -163,7 +163,7 @@ convertIconTheme() { } iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") - if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then + if [[ -n "$(ls -A1 "$iconsdir")" ]]; then icnsutil compose --toc "$out/${iconName}.icns" "$iconsdir/"* else echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." |