From 6ade3d068f1b3ce00bd72f7673fda0fd3441cd0a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 5 Jun 2012 18:07:12 +0200
Subject: [PATCH] import de scripts depuis ipasserelle-gp

---
 createlinks                                        |  5 +++
 packages/wpkg.xml                                  |  4 +-
 .../shares/wpkg/files/settings/wpkg/wpkg.bat/10All | 51 ++++++++++++++++++++++
 .../files/settings/wpkg/wpkg.bat/template-begin    |  0
 wpkg-packages.spec                                 | 11 ++++-
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 createlinks
 create mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/10All
 create mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/template-begin

diff --git a/createlinks b/createlinks
new file mode 100644
index 0000000..504f500
--- /dev/null
+++ b/createlinks
@@ -0,0 +1,5 @@
+#!/usr/bin/perl -w
+
+use esmith::Build::CreateLinks qw(:all);
+
+templates2events("/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat", qw(wpkg-update bootstrap-console-save));
diff --git a/packages/wpkg.xml b/packages/wpkg.xml
index c8be1bf..03b4342 100755
--- a/packages/wpkg.xml
+++ b/packages/wpkg.xml
@@ -2,7 +2,7 @@
 <packages>
     <package id="wpkg"
              name="WPKG Client"
-             revision="17"
+             revision="1"
              reboot="false"
              priority="95">
  
@@ -14,7 +14,7 @@
         <install cmd='%COMSPEC% /C if not exist %SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown mkdir %SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown' />
         <install cmd='xcopy /Y %SETTINGS%\wpkg\wpkg.bat %SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown\' />
         <install cmd='%COMSPEC% /C regedit /S %SOFTWARE%\wpkg\gp.reg' />
-        <install cmd='cscript //Nologo "%SOFTWARE%\misc\localgp.vbs" wpkg.bat false MACHINE' />
+        <install cmd='cscript //Nologo "%SOFTWARE%\wpkg\localgp.vbs" wpkg.bat false MACHINE' />
 
         <upgrade include='install' />
 
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/10All
new file mode 100644
index 0000000..bc33cc1
--- /dev/null
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/10All
@@ -0,0 +1,51 @@
+{
+
+my $ip = $InternalInterface{'IPAddress'};
+my $nt = $smb{'Workgroup'};
+my $pass = $wpkg{'UserPassword'};
+
+my $out .=<<"EOF";
+\@echo off
+cls
+echo.
+echo    #  ######
+echo.      #     #   ##    ####   ####  ###### #####  ###### #      #      ######
+echo    #  #     #  #  #  #      #      #      #    # #      #      #      #
+echo.   #  ######  #    #  ####   ####  #####  #    # #####  #      #      #####
+echo    #  #       ######      #      # #      #####  #      #      #      #
+echo.   #  #       #    # #    # #    # #      #   #  #      #      #      #
+echo    #  #       #    #  ####   ####  ###### #    # ###### ###### ###### ######
+echo.
+echo.
+echo.
+echo.
+echo.
+echo.       _________________________________________________________
+echo       i\\ _______________________________________________________\\
+echo.      i i                                                        i
+echo       i i   Mises a jour en cours. N'eteignez pas l'ordinateur   i
+echo.      i i                                                        i
+echo       i i   Il s'eteindra lui-meme a la fin des operations       i
+echo.      i i                                                        i
+echo        \\i________________________________________________________i
+echo.
+echo.
+
+ping -n 2 -w 2000 $ip > NUL
+if errorlevel 1 (
+   echo Reseau non connecte
+   exit /b %errorlevel%
+)
+net use \\\\$ip\\wpkg /user:$nt\\deploiement $pass >NUL
+net use \\\\$ip\\wpkglogs /user:$nt\\deploiement $pass >NUL
+set SOFTWARE=\\\\$ip\\wpkg\\softwares
+set SETTINGS=\\\\$ip\\wpkg\\settings
+set WPKGLOGS=\\\\$ip\\wpkglogs
+cscript  //Nologo \\\\$ip\\wpkg\\wpkg.js /synchronize /nonotify /quiet
+
+EOF
+
+$out =~ s/\n/\r\n/g;
+$OUT = $out;
+
+}
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg/wpkg.bat/template-begin
new file mode 100644
index 0000000..e69de29
diff --git a/wpkg-packages.spec b/wpkg-packages.spec
index 106e8b2..243aee5 100644
--- a/wpkg-packages.spec
+++ b/wpkg-packages.spec
@@ -1,4 +1,4 @@
-%define version 0.0.1
+%define version 0.0.2
 %define release 0.beta1
 
 Name:		wpkg-packages
@@ -14,6 +14,7 @@ License:	misc
 BuildRoot:	/var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch:	noarch
 BuildRequires:  unix2dos
+BuildRequires:	e-smith-devtools
 
 Requires: ipasserelle-gp
 Requires: wpkg-7zip
@@ -53,10 +54,12 @@ Meta package to install WPKG supported softwares on iPasserelle
 %setup -q -n %{name}-%{version}
 
 %build
+perl createlinks
 unix2dos packages/*
 
 %install
 /bin/rm -rf %{buildroot}
+cp -a root %{buildroot}/
 mkdir -p %{buildroot}/home/e-smith/files/shares/wpkg/files/packages
 mkdir -p %{buildroot}/home/e-smith/files/shares/wpkg/files/softwares/misc
 cp -r softwares/* %{buildroot}/home/e-smith/files/shares/wpkg/files/softwares/misc/
@@ -66,11 +69,15 @@ cp -r packages/* %{buildroot}/home/e-smith/files/shares/wpkg/files/packages/
 %defattr(-,root,root)
 %doc CHANGELOG.git
 /home/e-smith/files/shares/wpkg/files/
+/etc
 
 %clean
 /bin/rm -rf %{buildroot}
 
 %changelog
-* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com>
+* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com> 0.0.2-1
+- Move scripts from ipasserelle-gp in wpkg-packages
+
+* Tue Jun 5 2012 Daniel Berteaud <daniel@firewall-services.com> 0.0.1-1
 - initial release