begin to migrate from plural to singular, CONSISTENTLY
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								39b2976f9a
							
						
					
				
			
			
				commit
				
					
						238b5119eb
					
				
			
		
					 23 changed files with 17 additions and 24 deletions
				
			
		
							
								
								
									
										37
									
								
								conf/type/__file/explorers/md5sum
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										37
									
								
								conf/type/__file/explorers/md5sum
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,37 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
#
 | 
			
		||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
# Retrieve the md5sum of a file to be created, if it is already existing.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
################################################################################
 | 
			
		||||
# New code
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
if [ -f parameters/destination ]; then
 | 
			
		||||
   destination="$(cat parameters/destination)"
 | 
			
		||||
else
 | 
			
		||||
   destination="$1"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# No output if file does not exist - does definitely not match the md5sum :-)
 | 
			
		||||
if [ -e "$destination" ]; then
 | 
			
		||||
   md5sum "$destination"
 | 
			
		||||
fi
 | 
			
		||||
							
								
								
									
										52
									
								
								conf/type/__file/gencode
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										52
									
								
								conf/type/__file/gencode
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,52 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
#
 | 
			
		||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
# __file is a very basic type and should be able to be used as an
 | 
			
		||||
# example for typewrites later
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
type="$(cat parameters/type)"
 | 
			
		||||
 | 
			
		||||
# If destination was specified, do not use the id
 | 
			
		||||
if [ -f parameters/destination ]; then
 | 
			
		||||
   destination="$(cat parameters/destination)"
 | 
			
		||||
else
 | 
			
		||||
   destination="$1"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
case "$type" in
 | 
			
		||||
   directory)
 | 
			
		||||
      echo mkdir \"$destination\"
 | 
			
		||||
   ;;
 | 
			
		||||
 | 
			
		||||
   file)
 | 
			
		||||
      echo touch \"$destination\"
 | 
			
		||||
   ;;
 | 
			
		||||
 | 
			
		||||
   *)
 | 
			
		||||
      echo "Unsupported type: \"$type\"" >&2
 | 
			
		||||
      exit 1
 | 
			
		||||
   ;;
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
if [ -f parameters/mode ]; then
 | 
			
		||||
   mode="$(cat parameters/mode)"
 | 
			
		||||
   echo chmod \"$mode\" \"$destination\"
 | 
			
		||||
fi
 | 
			
		||||
							
								
								
									
										3
									
								
								conf/type/__file/parameters/optional
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								conf/type/__file/parameters/optional
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
mode
 | 
			
		||||
source
 | 
			
		||||
destination
 | 
			
		||||
							
								
								
									
										1
									
								
								conf/type/__file/parameters/required
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								conf/type/__file/parameters/required
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
type
 | 
			
		||||
							
								
								
									
										1
									
								
								conf/type/__issue/README
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								conf/type/__issue/README
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
Manage /etc/issue
 | 
			
		||||
							
								
								
									
										2
									
								
								conf/type/__issue/files/archlinux
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								conf/type/__issue/files/archlinux
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
Arch Linux \r  (\n) (\l) (cdist automated)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								conf/type/__issue/files/default
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								conf/type/__issue/files/default
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
Some OS  \r  (\n) (\l) (cdist automated)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										35
									
								
								conf/type/__issue/manifest
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										35
									
								
								conf/type/__issue/manifest
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,35 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
#
 | 
			
		||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
destination=/etc/issue
 | 
			
		||||
os="$(cat "out/explorers/os")"
 | 
			
		||||
 | 
			
		||||
case "$os" in
 | 
			
		||||
   archlinux)
 | 
			
		||||
      source="$(pwd -P)/files/archlinux"
 | 
			
		||||
   ;;
 | 
			
		||||
   *)
 | 
			
		||||
      source="$(pwd -P)/files/default"
 | 
			
		||||
   ;;
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
# FIXME: replace id with $destination post-1.0
 | 
			
		||||
__file etc-issue --source "$source" --destination "$destination" --type file
 | 
			
		||||
							
								
								
									
										0
									
								
								conf/type/__issue/parameters/optional
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								conf/type/__issue/parameters/optional
									
										
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								conf/type/__issue/parameters/required
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								conf/type/__issue/parameters/required
									
										
									
									
									
										Normal file
									
								
							
							
								
								
									
										7
									
								
								conf/type/__package/hints
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								conf/type/__package/hints
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
install/pacman:
 | 
			
		||||
pacman --noconfirm --noprogressbar -S
 | 
			
		||||
--------------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
ensure: What state the package should be in: present | absent | latest | versionstring (1.0.3)
 | 
			
		||||
name: The package name as used by the packaging system
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										46
									
								
								conf/type/__package/manifest
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										46
									
								
								conf/type/__package/manifest
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,46 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
#
 | 
			
		||||
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
# __package is an abstract type which dispatches to the lower level
 | 
			
		||||
# __package_$name types which do the actual interaction with the packaging 
 | 
			
		||||
# system.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
. cdist-config
 | 
			
		||||
 | 
			
		||||
object_id="$1"; shift
 | 
			
		||||
 | 
			
		||||
if [ -f type ]; then
 | 
			
		||||
   type="$(cat type)"
 | 
			
		||||
else
 | 
			
		||||
   # Default to value taken from explorer
 | 
			
		||||
   type="$(cat $__cdist_out_explorers/pkg_system)"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
set -- "$@" "$object_id"
 | 
			
		||||
for property in $(ls .); do
 | 
			
		||||
   if [ "$property" != "type" ]; then
 | 
			
		||||
      set -- "$@" "--$property" "$(cat $property)"
 | 
			
		||||
   fi
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
__package_$type "$@"
 | 
			
		||||
 | 
			
		||||
exit 0
 | 
			
		||||
							
								
								
									
										2
									
								
								conf/type/__package/parameters/optional
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								conf/type/__package/parameters/optional
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
name
 | 
			
		||||
type
 | 
			
		||||
							
								
								
									
										1
									
								
								conf/type/__package/parameters/required
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								conf/type/__package/parameters/required
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
ensure
 | 
			
		||||
							
								
								
									
										38
									
								
								conf/type/__package_emerge/gencode
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										38
									
								
								conf/type/__package_emerge/gencode
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,38 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
#
 | 
			
		||||
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
# Manage packages on gentoo.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
. cdist-config
 | 
			
		||||
 | 
			
		||||
object_id="$1"; shift
 | 
			
		||||
 | 
			
		||||
if [ -f name ]; then
 | 
			
		||||
   name="$(cat name)"
 | 
			
		||||
else
 | 
			
		||||
   name="$object_id"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# FIXME: super simple proof of concept
 | 
			
		||||
echo "emerge -q \"$name\""
 | 
			
		||||
 | 
			
		||||
exit 0
 | 
			
		||||
							
								
								
									
										7
									
								
								conf/type/__package_emerge/hints
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								conf/type/__package_emerge/hints
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
install/pacman:
 | 
			
		||||
pacman --noconfirm --noprogressbar -S
 | 
			
		||||
--------------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
ensure: What state the package should be in: present | absent | latest | versionstring (1.0.3)
 | 
			
		||||
name: The package name as used by the packaging system
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1
									
								
								conf/type/__package_emerge/parameters/optional
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								conf/type/__package_emerge/parameters/optional
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
name
 | 
			
		||||
							
								
								
									
										1
									
								
								conf/type/__package_emerge/parameters/required
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								conf/type/__package_emerge/parameters/required
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
ensure
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue