diff options
author | Guillaume Maudoux <layus.on@gmail.com> | 2016-11-25 15:48:27 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2016-11-25 15:48:27 +0100 |
commit | f78126bfd6b6c8477fcdbc09b2f98772dbe9a1e7 (patch) | |
tree | 23a76a33f21ce39184bcbdcd28cb937d15968ce7 | |
parent | 7ee43df8622cc0589d54248fb44cebe1c1d991d2 (diff) |
Get rid of unicode quotes (#1140)
96 files changed, 670 insertions, 670 deletions
diff --git a/corepkgs/derivation.nix b/corepkgs/derivation.nix index c0fbe8082..851c8d3ea 100644 --- a/corepkgs/derivation.nix +++ b/corepkgs/derivation.nix @@ -1,5 +1,5 @@ -/* This is the implementation of the ‘derivation’ builtin function. - It's actually a wrapper around the ‘derivationStrict’ primop. */ +/* This is the implementation of the 'derivation' builtin function. + It's actually a wrapper around the 'derivationStrict' primop. */ drvAttrs @ { outputs ? [ "out" ], ... }: diff --git a/mk/functions.mk b/mk/functions.mk index c48775db8..fdeb92a8a 100644 --- a/mk/functions.mk +++ b/mk/functions.mk @@ -1,9 +1,9 @@ # Utility function for recursively finding files, e.g. -# ‘$(call rwildcard, path/to/dir, *.c *.h)’. +# '$(call rwildcard, path/to/dir, *.c *.h)'. rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) # Given a file name, produce the corresponding dependency file -# (e.g. ‘foo/bar.o’ becomes ‘foo/.bar.o.dep’). +# (e.g. 'foo/bar.o' becomes 'foo/.bar.o.dep'). filename-to-dep = $(dir $1).$(notdir $1).dep # Return the full path to a program by looking it up in $PATH, or the diff --git a/mk/libraries.mk b/mk/libraries.mk index 3cd7a5310..8f60b0e00 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -11,9 +11,9 @@ else endif # Build a library with symbolic name $(1). The library is defined by -# various variables prefixed by ‘$(1)_’: +# various variables prefixed by '$(1)_': # -# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to +# - $(1)_NAME: the name of the library (e.g. 'libfoo'); defaults to # $(1). # # - $(1)_DIR: the directory where the (non-installed) library will be @@ -45,7 +45,7 @@ endif # - $(1)_INSTALL_DIR: the directory where the library will be # installed. Defaults to $(libdir). # -# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be +# - BUILD_SHARED_LIBS: if equal to '1', a dynamic library will be # built, otherwise a static library. define build-library $(1)_NAME ?= $(1) diff --git a/mk/programs.mk b/mk/programs.mk index 3ac64494e..e77cda1e0 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -1,7 +1,7 @@ programs-list := # Build a program with symbolic name $(1). The program is defined by -# various variables prefixed by ‘$(1)_’: +# various variables prefixed by '$(1)_': # # - $(1)_DIR: the directory where the (non-installed) program will be # placed. diff --git a/mk/templates.mk b/mk/templates.mk index c7ac7afbf..850fc8f17 100644 --- a/mk/templates.mk +++ b/mk/templates.mk @@ -1,7 +1,7 @@ template-files := # Create the file $(1) from $(1).in by running config.status (which -# substitutes all ‘@var@’ variables set by the configure script). +# substitutes all '@var@' variables set by the configure script). define instantiate-template clean-files += $(1) diff --git a/mk/tests.mk b/mk/tests.mk index 004a48028..e0d9ff146 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -1,4 +1,4 @@ -# Run program $1 as part of ‘make installcheck’. +# Run program $1 as part of 'make installcheck'. define run-install-test installcheck: $1 diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in index 3575d99cb..c23e1ae4b 100644 --- a/perl/lib/Nix/Config.pm.in +++ b/perl/lib/Nix/Config.pm.in @@ -33,7 +33,7 @@ sub readConfig { my $config = "$confDir/nix.conf"; return unless -f $config; - open CONFIG, "<$config" or die "cannot open ‘$config’"; + open CONFIG, "<$config" or die "cannot open '$config'"; while (<CONFIG>) { /^\s*([\w\-\.]+)\s*=\s*(.*)$/ or next; $config{$1} = $2; diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index affb3ea52..902ee1a1b 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -35,14 +35,14 @@ sub copyToOpen { my $missingSize = 0; $missingSize += (queryPathInfo($_, 1))[3] foreach @missing; - printf STDERR "copying %d missing paths (%.2f MiB) to ‘$sshHost’...\n", + printf STDERR "copying %d missing paths (%.2f MiB) to '$sshHost'...\n", scalar(@missing), $missingSize / (1024**2); return if $dryRun; # Send the "import paths" command. syswrite($to, pack("L<x4", 4)) or die; exportPaths(fileno($to), @missing); - readInt($from) == 1 or die "remote machine ‘$sshHost’ failed to import closure\n"; + readInt($from) == 1 or die "remote machine '$sshHost' failed to import closure\n"; } diff --git a/perl/lib/Nix/Manifest.pm b/perl/lib/Nix/Manifest.pm index 0da376761..6438398e1 100644 --- a/perl/lib/Nix/Manifest.pm +++ b/perl/lib/Nix/Manifest.pm @@ -60,10 +60,10 @@ sub readManifest_ { # Decompress the manifest if necessary. if ($manifest =~ /\.bz2$/) { open MANIFEST, "$Nix::Config::bzip2 -d < $manifest |" - or die "cannot decompress ‘$manifest’: $!"; + or die "cannot decompress '$manifest': $!"; } else { open MANIFEST, "<$manifest" - or die "cannot open ‘$manifest’: $!"; + or die "cannot open '$manifest': $!"; } my $inside = 0; @@ -287,7 +287,7 @@ sub parseNARInfo { # FIXME: might be useful to support multiple signatures per .narinfo. if (!defined $sig) { - warn "NAR info file ‘$location’ lacks a signature; ignoring\n"; + warn "NAR info file '$location' lacks a signature; ignoring\n"; return undef; } my ($keyName, $sig64) = split ":", $sig; @@ -295,7 +295,7 @@ sub parseNARInfo { my $publicKey = $Nix::Config::binaryCachePublicKeys{$keyName}; if (!defined $publicKey) { - warn "NAR info file ‘$location’ is signed by unknown key ‘$keyName’; ignoring\n"; + warn "NAR info file '$location' is signed by unknown key '$keyName'; ignoring\n"; return undef; } @@ -306,12 +306,12 @@ sub parseNARInfo { [ map { "$Nix::Config::storeDir/$_" } @refs ]); }; if ($@) { - warn "cannot compute fingerprint of ‘$location’; ignoring\n"; + warn "cannot compute fingerprint of '$location'; ignoring\n"; return undef; } if (!checkSignature($publicKey, decode_base64($sig64), $fingerprint)) { - warn "NAR info file ‘$location’ has an incorrect signature; ignoring\n"; + warn "NAR info file '$location' has an incorrect signature; ignoring\n"; return undef; } diff --git a/perl/lib/Nix/SSH.pm b/perl/lib/Nix/SSH.pm index 95393d881..4b3d84b19 100644 --- a/perl/lib/Nix/SSH.pm +++ b/perl/lib/Nix/SSH.pm @@ -84,7 +84,7 @@ sub connectToRemoteNix { $extraFlags ||= ""; - # Start ‘nix-store --serve’ on the remote host. + # Start 'nix-store --serve' on the remote host. my ($from, $to); # FIXME: don't start a shell, start ssh directly. my $pid = open2($from, $to, "exec ssh -x -a $sshHost @globalSshOpts @{$sshOpts} nix-store --serve --write $extraFlags"); @@ -97,7 +97,7 @@ sub connectToRemoteNix { syswrite($to, pack("L<x4L<x4", $SERVE_MAGIC_1, $clientVersion)) or die; $magic = readInt($from); }; - die "unable to connect to ‘$sshHost’\n" if $@; + die "unable to connect to '$sshHost'\n" if $@; die "did not get valid handshake from remote host\n" if $magic != 0x5452eecb; my $serverVersion = readInt($from); diff --git a/perl/lib/Nix/Utils.pm b/perl/lib/Nix/Utils.pm index 392c45f2f..44955a706 100644 --- a/perl/lib/Nix/Utils.pm +++ b/perl/lib/Nix/Utils.pm @@ -10,7 +10,7 @@ $urlRE = "(?: [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\! sub checkURL { my ($url) = @_; - die "invalid URL ‘$url’\n" unless $url =~ /^ $urlRE $ /x; + die "invalid URL '$url'\n" unless $url =~ /^ $urlRE $ /x; } sub uniq { @@ -26,7 +26,7 @@ sub uniq { sub writeFile { my ($fn, $s) = @_; - open TMP, ">$fn" or die "cannot create file ‘$fn’: $!"; + open TMP, ">$fn" or die "cannot create file '$fn': $!"; print TMP "$s" or die; close TMP or die; } @@ -34,7 +34,7 @@ sub writeFile { sub readFile { local $/ = undef; my ($fn) = @_; - open TMP, "<$fn" or die "cannot open file ‘$fn’: $!"; + open TMP, "<$fn" or die "cannot open file '$fn': $!"; my $s = <TMP>; close TMP or die; return $s; diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index b5fc629eb..62e517f06 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -209,7 +209,7 @@ REQ: while (1) { }; last REQ unless $@; print STDERR "$@"; - warn "unable to open SSH connection to ‘$hostName’, trying other available machines...\n"; + warn "unable to open SSH connection to '$hostName', trying other available machines...\n"; $from = undef; $to = undef; $machine->{enabled} = 0; @@ -251,7 +251,7 @@ close UPLOADLOCK; # Perform the build. -print STDERR "building ‘$drvPath’ on ‘$hostName’\n"; +print STDERR "building '$drvPath' on '$hostName'\n"; writeInt(6, $to) or die; # == cmdBuildPaths writeStrings([$drvPath], $to); writeInt($maxSilentTime, $to); @@ -259,7 +259,7 @@ writeInt($buildTimeout, $to); my $res = readInt($from); if ($res != 0) { my $msg = decode("utf-8", readString($from)); - print STDERR "error: $msg on ‘$hostName’\n"; + print STDERR "error: $msg on '$hostName'\n"; exit $res; } diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh index fd38a4528..2b1d1888b 100644 --- a/scripts/install-nix-from-closure.sh +++ b/scripts/install-nix-from-closure.sh @@ -27,13 +27,13 @@ if ! [ -e $dest ]; then cmd="mkdir -m 0755 $dest && chown $USER $dest" echo "directory $dest does not exist; creating it by running '$cmd' using sudo" >&2 if ! sudo sh -c "$cmd"; then - echo "$0: please manually run ‘$cmd’ as root to create $dest" >&2 + echo "$0: please manually run '$cmd' as root to create $dest" >&2 exit 1 fi fi if ! [ -w $dest ]; then - echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see http://nixos.org/nix/manual/#ssec-multi-user. If you wish to continue with a single-user install for $USER please run ‘chown -R $USER $dest’ as root." >&2 + echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see http://nixos.org/nix/manual/#ssec-multi-user. If you wish to continue with a single-user install for $USER please run 'chown -R $USER $dest' as root." >&2 exit 1 fi diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index af1d30919..24912c8db 100755 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -38,7 +38,7 @@ while (@ARGV) { exec "man nix-copy-closure" or die; } elsif ($arg eq "--gzip" || $arg eq "--bzip2" || $arg eq "--xz") { - warn "$0: ‘$arg’ is not implemented\n" if $arg ne "--gzip"; + warn "$0: '$arg' is not implemented\n" if $arg ne "--gzip"; push @globalSshOpts, "-C"; } elsif ($arg eq "--from") { @@ -51,7 +51,7 @@ while (@ARGV) { $includeOutputs = 1; } elsif ($arg eq "--show-progress") { - warn "$0: ‘$arg’ is not implemented\n"; + warn "$0: '$arg' is not implemented\n"; } elsif ($arg eq "--dry-run") { $dryRun = 1; @@ -93,7 +93,7 @@ else { # Copy FROM the remote machine. # Export the store paths on the remote machine and import them locally. if (scalar @missing > 0) { - print STDERR "copying ", scalar @missing, " missing paths from ‘$sshHost’...\n"; + print STDERR "copying ", scalar @missing, " missing paths from '$sshHost'...\n"; writeInt(5, $to); # == cmdExportPaths writeInt(0, $to); # obsolete writeStrings(\@missing, $to); diff --git a/src/buildenv/buildenv.cc b/src/buildenv/buildenv.cc index f997096ed..885c5e169 100644 --- a/src/buildenv/buildenv.cc +++ b/src/buildenv/buildenv.cc @@ -12,7 +12,7 @@ static bool isDirectory (const Path & path)< |