From d400ae382e09b091fb372ffc9163273ff40ddb1d Mon Sep 17 00:00:00 2001
From: nick <nick@debian.hws.edu>
Date: Tue, 21 Apr 2009 12:26:30 -0500
Subject: Store MD5 sums as variables, avoid data duplication, increase
 clarity.

---
 pst/install-2cd-extra.sh   |  6 ++++--
 pst/install-2cd-minimal.sh |  2 +-
 pst/install-4cd-extra.sh   | 10 +++++++---
 pst/install-4cd-minimal.sh |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'pst')

diff --git a/pst/install-2cd-extra.sh b/pst/install-2cd-extra.sh
index 6901c10..c8f3d36 100755
--- a/pst/install-2cd-extra.sh
+++ b/pst/install-2cd-extra.sh
@@ -9,7 +9,9 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 640b61443cc86c434f1b6826e63c0e33 data1.cab
+CD2="610d9f6354be741b09fc25b5e9645328"
+
+getcd 1 $PST_2CD_MD5 data1.cab
 
 unshield -g OtherData -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die
 unshield -g OtherData -L x $CDMOUNT/data2.cab -d "$TARGETDIR" || die
@@ -17,7 +19,7 @@ unshield -g OtherData -L x $CDMOUNT/data2.cab -d "$TARGETDIR" || die
 mv "$TARGETDIR"/otherdata/* "$TARGETDIR" || die
 rmdir "$TARGETDIR"/otherdata || die
 
-getcd 2 610d9f6354be741b09fc25b5e9645328 cd2/movies4.bif
+getcd 2 $CD2 cd2/movies4.bif
 
 copylower "$CDMOUNT/cd2/" "$TARGETDIR" || die
 
diff --git a/pst/install-2cd-minimal.sh b/pst/install-2cd-minimal.sh
index d868b90..fc5dc4a 100755
--- a/pst/install-2cd-minimal.sh
+++ b/pst/install-2cd-minimal.sh
@@ -11,7 +11,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 640b61443cc86c434f1b6826e63c0e33 data1.cab
+getcd 1 $PST_2CD_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
diff --git a/pst/install-4cd-extra.sh b/pst/install-4cd-extra.sh
index 064edb4..23dee20 100755
--- a/pst/install-4cd-extra.sh
+++ b/pst/install-4cd-extra.sh
@@ -9,13 +9,17 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 2 99be7c8544016302c820088091c52fef cd2/movies2.bif
+CD2="99be7c8544016302c820088091c52fef"
+CD3="6ffd2c51a41603c7dca6196d9bef2e26"
+CD4="b70322aaa7b1d61a168a766eba399085"
+
+getcd 2  $CD2 cd2/movies2.bif
 copylower "$CDMOUNT/cd2/" "$TARGETDIR" || die
 
-getcd 3 6ffd2c51a41603c7dca6196d9bef2e26 cd3/AR0500.bif
+getcd 3 $CD3 cd3/AR0500.bif
 copylower "$CDMOUNT/cd3/" "$TARGETDIR" || die
 
-getcd 4 b70322aaa7b1d61a168a766eba399085 cd4/movies4.bif
+getcd 4 $CD4 cd4/movies4.bif
 copylower "$CDMOUNT/cd4/" "$TARGETDIR" || die
 
 setperms "$TARGETDIR"
diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh
index 5ffb88b..0401e32 100755
--- a/pst/install-4cd-minimal.sh
+++ b/pst/install-4cd-minimal.sh
@@ -11,7 +11,7 @@ parseargs "$@"
 
 checkforbin unshield
 
-getcd 1 5e8c2075163aca124de4a467fb33063d data1.cab
+getcd 1 $PST_4CD_MD5 data1.cab
 
 mkdir -p "$TARGETDIR" || die
 
-- 
cgit v1.2.3