Learning Circle : cdist #6 - update 1

youngjin.han/dot-cdist/manifest/init

@@ -8,7 +8,7 @@ case "$__target_host" in
 #        __colourful_file --colour yellow --colour blue --colour red --colour green
 #        __my_dotfiles
 #        __my_nginx_site $__target_host
-#	__all_in_one $__target_host --with-x --extra-packages tree --extra-packages htop
+#	__all_in_one --with-x --extra-packages tree --extra-packages htop
 	__my_firewall --file /etc/my-nftables
     ;;
     jafo.laptop)

youngjin.han/dot-cdist/type/__all_in_one/manifest

@@ -1,12 +1,10 @@
 #!/bin/sh -e
 
 os="$(cat "$__global/explorer/os")"
-default_package_name="socat sipalc sudo"
+default_package_name="socat sipcalc sudo"
 
 if [ -f "$__object/parameter/with-x" ]; then
     with_x="$(cat "$__object/parameter/with-x")"
-else
-    with_x="$__object_id"
 fi
 
 case "$os" in
@@ -14,7 +12,7 @@ case "$os" in
         name_netcat="netcat-openbsd"
         name_wireshark="tshark"
      ;;
-     debian)
+     debian|devuan)
         name_netcat="netcat"
         name_wireshark="tshark"
      ;;
@@ -33,12 +31,12 @@ all_package_name="$default_package_name $name_netcat $name_wireshark"
 
 __package_update_index
 
-for package in $all_package_name;
-    do require="__apt_update_index" __package $package --state=present
+for package in $all_package_name; do
+    require="__package_update_index" __package $package --state=present
 done
 
 if [ -f "$__object/parameter/extra-packages" ]; then
     for package in $(cat "$__object/parameter/extra-packages"); do
-        require="__apt_update_index" __package $package --state=present
+        require="__package_update_index" __package $package --state=present
     done
 fi