Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #172 from apenney/fix-newlines
Fix newlines.
  • Loading branch information
Ashley Penney committed Apr 21, 2014
2 parents ca37c46 + a2df44a commit a278e50
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 12 deletions.
8 changes: 4 additions & 4 deletions files/concatfragments.sh
Expand Up @@ -113,17 +113,17 @@ else
printf '%s\n' "$WARNMSG" > "fragments.concat"
fi

if [ "x${ENSURE_NEWLINE}" != "x" ]; then
find fragments/ -type f -follow -print0 | xargs -0 -I '{}' sh -c 'if [ -n "$(tail -c 1 < {} )" ]; then echo >> {} ; fi'
fi

# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
IFS_BACKUP=$IFS
IFS='
'
for fragfile in `find fragments/ -type f -follow | LC_ALL=C sort ${SORTARG}`
do
cat $fragfile >> "fragments.concat"
# Handle newlines.
if [ "x${ENSURE_NEWLINE}" != "x" ]; then
echo >> "fragments.concat"
fi
done
IFS=$IFS_BACKUP

Expand Down
19 changes: 19 additions & 0 deletions spec/acceptance/nodesets/aix-71-vcloud.yml
@@ -0,0 +1,19 @@
HOSTS:
pe-aix-71-acceptance:
roles:
- master
- dashboard
- database
- agent
- default
platform: aix-7.1-power
hypervisor: aix
ip: pe-aix-71-acceptance.delivery.puppetlabs.net
CONFIG:
type: pe
nfs_server: NONE
consoleport: 443
datastore: instance0
folder: Delivery/Quality Assurance/Enterprise/Dynamic
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
pooling_api: http://vcloud.delivery.puppetlabs.net/
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/centos-64-x64.yml
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: git
type: foss
11 changes: 11 additions & 0 deletions spec/acceptance/nodesets/debian-73-x64.yml
@@ -0,0 +1,11 @@
HOSTS:
debian-73-x64.localhost:
roles:
- master
platform: debian-7-amd64
box : debian-73-x64-virtualbox-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
hypervisor : vagrant
CONFIG:
log_level: debug
type: foss
8 changes: 4 additions & 4 deletions spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
HOSTS:
centos-64-x64:
centos-64-x64.localdomain:
roles:
- master
platform: el-6-x86_64
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
box : centos-65-x64-virtualbox-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
hypervisor : vagrant
CONFIG:
type: git
type: foss
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/fedora-18-x64.yml
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: git
type: foss
10 changes: 10 additions & 0 deletions spec/acceptance/nodesets/sles-11-x64.yml
@@ -0,0 +1,10 @@
HOSTS:
sles-11-x64.local:
roles:
- master
platform: sles-11-x64
box : sles-11sp1-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: git
type: foss
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
Expand Up @@ -7,4 +7,4 @@ HOSTS:
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: git
type: foss

0 comments on commit a278e50

Please sign in to comment.