From: root <root@xenhost00.office.fsf.org>
Date: Mon, 18 Aug 2014 13:44:04 +0000 (-0400)
Subject: Added patched version of git configs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4e8419cc862dc986d5d7c1fa7972d0cf71b175e0;p=fai-configs.git

Added patched version of git configs
---

diff --git a/files/usr/lib/fai/get-config-dir-git/DEFAULT b/files/usr/lib/fai/get-config-dir-git/DEFAULT
new file mode 100755
index 0000000..0e6fc61
--- /dev/null
+++ b/files/usr/lib/fai/get-config-dir-git/DEFAULT
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# (c) 2002-2006 Henning Glawe <glaweh@debian.org>
+# (c) 2007 Holger Levsen <holger@layer-acht.org> for the modifications to use git
+
+### BEGIN SUBROUTINE INFO
+# Provides-Var:
+# Requires-Var:    $FAI_CONFIG_SRC $FAI $LOGDIR
+# Suggests-Var:
+# Short-Description: get $FAI from a git repository.
+### END SUBROUTINE INFO
+
+# matched string: "git://gitpath"
+protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
+gitpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^[:space:]]\+\)')
+
+case $protocol in
+	git)
+		giturl="git://$gitpath"
+		;;
+	git+http)
+		echo git+http
+		giturl="http://$gitpath"
+		;;
+	git+ssh)
+		echo git+ssh
+		giturl=$gitpath
+		;;
+	*)
+		echo "get-config-dir-git: protocol $protocol not implemented"
+		exit 1
+		;;
+esac
+		
+if [ -d "$FAI/.git" ] ; then
+   echo "Updating git copy in $FAI"
+   cd $FAI
+   git pull
+   task_error 701 $?
+else 
+   echo "Checking out from git"
+   # cloning into an existing directory is not allowed
+   if [ -d $FAI ]; then rmdir $FAI; fi
+   git clone $giturl $FAI 
+   task_error 702 $?
+fi
diff --git a/package_config/WORKSTATION b/package_config/WORKSTATION
index ff821e7..7db6617 100644
--- a/package_config/WORKSTATION
+++ b/package_config/WORKSTATION
@@ -1,4 +1,5 @@
 PACKAGES aptitude WORKSTATION
+abrowser
 libreoffice
 thunderbird
 enigmail
diff --git a/scripts/FAIBASE/50-patch-get-configs-git b/scripts/FAIBASE/50-patch-get-configs-git
new file mode 100644
index 0000000..0170b2e
--- /dev/null
+++ b/scripts/FAIBASE/50-patch-get-configs-git
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+fcopy -v /usr/lib/fai/get-config-dir-git
\ No newline at end of file