From b76ec6cccabfeed13f4c008d007fb6884e9628c1 Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Thu, 4 May 2017 03:25:20 -0400
Subject: [PATCH] sample script shufflin'

---
 aif.xml                                   | 5 ++++-
 aifclient.py                              | 2 ++
 script-samples/{post.sh => post/first.sh} | 0
 script-samples/post/second.py             | 3 +++
 script-samples/{pre.sh => pre/first.sh}   | 0
 script-samples/pre/second.pl              | 6 ++++++
 6 files changed, 15 insertions(+), 1 deletion(-)
 rename script-samples/{post.sh => post/first.sh} (100%)
 create mode 100644 script-samples/post/second.py
 rename script-samples/{pre.sh => pre/first.sh} (100%)
 create mode 100644 script-samples/pre/second.pl

diff --git a/aif.xml b/aif.xml
index 7173e81..b253698 100644
--- a/aif.xml
+++ b/aif.xml
@@ -53,5 +53,8 @@
         </software>
     </pacman>
     <bootloader type="grub" target="/boot" efi="true" />
-    <script uri="https://aif.square-r00t.net/sample-scripts/pre.sh" order="1" bootstrap="1" />
+    <script uri="https://aif.square-r00t.net/sample-scripts/post/first.sh" order="1" bootstrap="0" />
+    <script uri="https://aif.square-r00t.net/sample-scripts/pre/second.pl" order="2" bootstrap="1" />
+    <script uri="https://aif.square-r00t.net/sample-scripts/pre/first.sh" order="1" bootstrap="1" />
+    <script uri="https://aif.square-r00t.net/sample-scripts/post/second.py" order="2" bootstrap="0" />
 </aif>
diff --git a/aifclient.py b/aifclient.py
index 358fce7..b1828d5 100755
--- a/aifclient.py
+++ b/aifclient.py
@@ -339,6 +339,7 @@ class aif(object):
             aifdict['scripts']['post'] = []
             tempscriptdict = {'pre': {}, 'post': {}}
             for x in xmlobj.find('scripts'):
+                print(x.attrib['uri'])
                 if all(keyname in list(x.attrib.keys()) for keyname in ('user', 'password')):
                     auth = {}
                     auth['user'] = x.attrib['user']
@@ -350,6 +351,7 @@ class aif(object):
                     scriptcontents = self.webFetch(x.attrib['uri'], auth).decode('utf-8')
                 else:
                     scriptcontents = self.webFetch(x.attrib['uri']).decode('utf-8')
+                print(scriptcontents)
                 if x.attrib['bootstrap'].lower() in ('true', '1'):
                     tempscriptdict['pre'][x.attrib['order']] = scriptcontents
                 else:
diff --git a/script-samples/post.sh b/script-samples/post/first.sh
similarity index 100%
rename from script-samples/post.sh
rename to script-samples/post/first.sh
diff --git a/script-samples/post/second.py b/script-samples/post/second.py
new file mode 100644
index 0000000..70c1f14
--- /dev/null
+++ b/script-samples/post/second.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+
+print('And this is the second post script.\n')
diff --git a/script-samples/pre.sh b/script-samples/pre/first.sh
similarity index 100%
rename from script-samples/pre.sh
rename to script-samples/pre/first.sh
diff --git a/script-samples/pre/second.pl b/script-samples/pre/second.pl
new file mode 100644
index 0000000..380cc0f
--- /dev/null
+++ b/script-samples/pre/second.pl
@@ -0,0 +1,6 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+print "And this is the second pre (bootstrap) script.\n";