From 2674fbd03f2c1417811df94906e3246b96b50ec0 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Sat, 2 Feb 2019 13:02:52 +0100
Subject: [PATCH] Disable .gitattributes ident (#2324)

---
 .gitattributes                       | 2 --
 .travis.yml                          | 1 +
 application/config/config.php        | 2 +-
 application/views/partial/footer.php | 2 +-
 application/views/partial/header.php | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b89b92b39..32d68b41c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
 dist/ merge=ours
 application/language/**/*.php merge=ours
 text=auto
-application/config/config.php ident
-application/views/partial/footer.php ident
diff --git a/.travis.yml b/.travis.yml
index 8eb3f1d8b..e17de20ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ script:
   - docker run --rm -v $(pwd):/app composer/composer install
   - docker run --rm -v $(pwd):/app -w /app lucor/php7-cli php bin/install.php translations
     develop
+  - HEAD=$(git rev-parse HEAD) sed -i "s/\(\$Id\)/$HEAD/g" application/config/config.php
   - docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt
     sh -c "npm install && bower install && grunt package"
   - docker-compose build
diff --git a/application/config/config.php b/application/config/config.php
index bd72045ef..31e6b1499 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -19,7 +19,7 @@ $config['application_version'] = '3.3.0';
 | 
 | 
 */ 
-$config['commit_sha1'] = '$Id $';
+$config['commit_sha1'] = '$Id';
  
 /* 
 |-------------------------------------------------------------------------- 
diff --git a/application/views/partial/footer.php b/application/views/partial/footer.php
index 4f5ad5761..caf661ec2 100644
--- a/application/views/partial/footer.php
+++ b/application/views/partial/footer.php
@@ -4,7 +4,7 @@
 	<div id="footer">
 		<div class="jumbotron push-spaces">
 			<strong><?php echo $this->lang->line('common_you_are_using_ospos'); ?>
-  			<?php echo $this->config->item('application_version'); ?> - <?php echo substr('$Id$', 5, 7); ?></strong>.
+  			<?php echo $this->config->item('application_version'); ?> - <?php echo substr($this->config->item('commit_sha1'), 0, 5); ?></strong>.
 			<?php echo $this->lang->line('common_please_visit_my'); ?>
 			<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
 			<?php echo $this->lang->line('common_learn_about_project'); ?>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 5d6288ccd..08a1957ba 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -77,7 +77,7 @@
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c729835075"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=b9e3a39941"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=aaf585bba7"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>