* set-force directive

Author: adamansky

dist/autark.c

@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 #define META_VERSION "0.9.0"
-#define META_REVISION "abe2739"
+#define META_REVISION "74c76ad"
 
 #endif
 #define _AMALGAMATE_
@@ -3841,8 +3841,12 @@ static struct unit* _unit_for_set(struct node *n, struct node *nn, const char **
 
 static void _set_init(struct node *n);
 
+static bool _set_is_force(struct node *n) {
+  return strcmp(n->value, "set-force") == 0;
+}
+
 static void _set_setup(struct node *n) {
-  if (!n->init) {
+  if (_set_is_force(n)) {
     _set_init(n);
   }
   if (n->child && strcmp(n->value, "env") == 0) {
@@ -3874,10 +3878,6 @@ static void _set_init(struct node *n) {
   unit_env_set_node(unit, key, n);
 }
 
-static bool _set_is_force(struct node *n) {
-  return strcmp(n->value, "set-force") == 0;
-}
-
 static const char* _set_value_get(struct node *n) {
   if (n->recur_next.active && n->recur_next.n) {
     return _set_value_get(n->recur_next.n);

dist/build.sh

@@ -6,7 +6,7 @@
 # https://github.com/Softmotions/autark
 
 META_VERSION=0.9.0
-META_REVISION=abe2739
+META_REVISION=74c76ad
 cd "$(cd "$(dirname "$0")"; pwd -P)"
 
 prev_arg=""
@@ -62,7 +62,7 @@ cat <<'a292effa503b' > ${AUTARK_HOME}/autark.c
 #ifndef CONFIG_H
 #define CONFIG_H
 #define META_VERSION "0.9.0"
-#define META_REVISION "abe2739"
+#define META_REVISION "74c76ad"
 #endif
 #define _AMALGAMATE_
 #define _XOPEN_SOURCE 700
@@ -3299,8 +3299,11 @@ static struct unit* _unit_for_set(struct node *n, struct node *nn, const char **
   return unit_peek();
 }
 static void _set_init(struct node *n);
+static bool _set_is_force(struct node *n) {
+  return strcmp(n->value, "set-force") == 0;
+}
 static void _set_setup(struct node *n) {
-  if (!n->init) {
+  if (_set_is_force(n)) {
     _set_init(n);
   }
   if (n->child && strcmp(n->value, "env") == 0) {
@@ -3330,9 +3333,6 @@ static void _set_init(struct node *n) {
   }
   unit_env_set_node(unit, key, n);
 }
-static bool _set_is_force(struct node *n) {
-  return strcmp(n->value, "set-force") == 0;
-}
 static const char* _set_value_get(struct node *n) {
   if (n->recur_next.active && n->recur_next.n) {
     return _set_value_get(n->recur_next.n);

node_set.c

@@ -25,8 +25,12 @@ static struct unit* _unit_for_set(struct node *n, struct node *nn, const char **
 
 static void _set_init(struct node *n);
 
+static bool _set_is_force(struct node *n) {
+  return strcmp(n->value, "set-force") == 0;
+}
+
 static void _set_setup(struct node *n) {
-  if (!n->init) {
+  if (_set_is_force(n)) {
     _set_init(n);
   }
   if (n->child && strcmp(n->value, "env") == 0) {
@@ -58,10 +62,6 @@ static void _set_init(struct node *n) {
   unit_env_set_node(unit, key, n);
 }
 
-static bool _set_is_force(struct node *n) {
-  return strcmp(n->value, "set-force") == 0;
-}
-
 static const char* _set_value_get(struct node *n) {
   if (n->recur_next.active && n->recur_next.n) {
     return _set_value_get(n->recur_next.n);