File: 09_use_correct_install_dir_dlp4hydra.diff

package info (click to toggle)
hydra 9.6-3
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 3,856 kB
  • sloc: ansic: 22,258; sh: 2,530; makefile: 140
file content (46 lines) | stat: -rw-r--r-- 1,658 bytes parent folder | download | duplicates (5)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
Description: Change upstream path for one suitable for GNU Debian.
Forwarded: not-needed
Author: Daniel Echeverri <epsilon77@gmail.com>
Last-Update: 2014-05-31
--- a/dpl4hydra.sh
+++ b/dpl4hydra.sh
@@ -8,8 +8,8 @@
 # Credits:  Thanks to van Hauser for support and fixing portability issues.
 #           "The universe is an intelligence test." -Timothy Leary (R.I.P.)
 
-INSTALLDIR=/usr/local
-LOCATION=etc
+INSTALLDIR=$HOME
+LOCATION=.dpl4hydra
 
 usage ()
 {
@@ -129,11 +129,11 @@
     fi
   fi
 
-  cat $FULLFILE 2>/dev/null | grep -i "$PATTERN" | awk -F"," '{ print $5":"$6 }' | sed 's/^[ \t]*//' | sed 's/[ \t]*$//' | sort | uniq > $HYDRAFILE
+  cat $FULLFILE 2>/dev/null | grep -i "$PATTERN" | awk -F"," '{ print $5":"$6 }' | sed 's/^[ \t]*//' | sed 's/[ \t]*$//' | sort | uniq > $DPLPATH/$HYDRAFILE
 
-  ENTRIES=`wc -l $HYDRAFILE | awk '{ print $1 }'`
+  ENTRIES=`wc -l $DPLPATH/$HYDRAFILE | awk '{ print $1 }'`
   if [ "$ENTRIES" -eq 0 ]; then
-    rm -f $HYDRAFILE
+    rm -f $DPLPATH/$HYDRAFILE
     echo
     echo "ERROR: No matching entries found for $BRAND systems." >&2
     echo "       File $HYDRAFILE was not created." >&2
@@ -155,10 +155,12 @@
 LC_ALL=C
 export LC_ALL
 DPLPATH="."
+CSVPATH="/usr/share/hydra"
 test -r "$DPLPATH/dpl4hydra_full.csv" || DPLPATH="$INSTALLDIR/$LOCATION"
+test -d "$INSTALLDIR/$LOCATION" || mkdir -p "$INSTALLDIR/$LOCATION"
 FULLFILE="$DPLPATH/dpl4hydra_full.csv"
 OLDFILE="$DPLPATH/dpl4hydra_full.old"
-LOCALFILE="$DPLPATH/dpl4hydra_local.csv"
+LOCALFILE="$CSVPATH/dpl4hydra_local.csv"
 INDEXSITE="$DPLPATH/dpl4hydra_index.tmp"
 SUBSITES="$DPLPATH/dpl4hydra_subs.tmp"
 CLEANFILE="$DPLPATH/dpl4hydra_clean.tmp"