aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2009-04-29 03:06:38 +0000
committerJason Woodward2009-04-29 03:06:38 +0000
commit5e0b4bd7dd78d252309da39ef76e0d18aee1fa86 (patch)
tree0525ad575062c7319f8b8b72f67171bf6b81fca0
parent24da4a857f12aedf6a1cad22936dcc6d647aa73a (diff)
downloadslapt-get-5e0b4bd7dd78d252309da39ef76e0d18aee1fa86.tar.gz
fixed small issues in FAQ#17 script
-rw-r--r--ChangeLog3
-rw-r--r--FAQ6
-rw-r--r--FAQ.html6
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 345a30e..82628c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.10.1b Apr 28, 2009
+ * fixed small issues in FAQ#17 script
+
0.10.1a Apr 28, 2009
* modernized script in FAQ#17. How do I create my own package source?
* updated makefile for building the slapt-get package
diff --git a/FAQ b/FAQ
index df1a09f..d4e350f 100644
--- a/FAQ
+++ b/FAQ
@@ -386,11 +386,11 @@ Frequently Asked Questions:
NAME=$(echo $1|sed -re "s/(.*\/)(.*.$PKGEXT)$/\2/")
LOCATION=$(echo $1|sed -re "s/(.*)\/(.*.$PKGEXT)$/\1/")
- SIZE=$(du -bk $1)
+ SIZE=$(du -bk $1 | awk '{print $1}')
USIZE=$(expr $(cat $1 | $DECOMPRESS -dc | wc -c) / 1024)
REQUIRED=$($DECOMPRESS -dc $1 | tar -xO install/slack-required 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
CONFLICTS=$($DECOMPRESS -dc $1 | tar -xO install/slack-conflicts 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
- SUGGESTS=$($DECOMPRESS -dc | tar -xO install/slack-suggests 2>/dev/null|xargs -r )
+ SUGGESTS=$($DECOMPRESS -dc $1 | tar -xO install/slack-suggests 2>/dev/null|xargs -r )
METAFILE=${NAME%$PKGEXT}meta
echo "PACKAGE NAME: $NAME" > $LOCATION/$METAFILE
if [ -n "$DL_URL" ]; then
@@ -403,7 +403,7 @@ Frequently Asked Questions:
echo "PACKAGE CONFLICTS: $CONFLICTS" >> $LOCATION/$METAFILE
echo "PACKAGE SUGGESTS: $SUGGESTS" >> $LOCATION/$METAFILE
echo "PACKAGE DESCRIPTION:" >> $LOCATION/$METAFILE
- $DECOMPRESS -dc | tar -xO install/slack-desc |grep -E '\w+\:'|grep -v '^#' >> $LOCATION/$METAFILE
+ $DECOMPRESS -dc $1 | tar -xO install/slack-desc |grep -E '\w+\:'|grep -v '^#' >> $LOCATION/$METAFILE
echo "" >> $LOCATION/$METAFILE
}
diff --git a/FAQ.html b/FAQ.html
index 62801cc..017aa71 100644
--- a/FAQ.html
+++ b/FAQ.html
@@ -400,11 +400,11 @@
NAME=$(echo $1|sed -re "s/(.*\/)(.*.$PKGEXT)$/\2/")
LOCATION=$(echo $1|sed -re "s/(.*)\/(.*.$PKGEXT)$/\1/")
- SIZE=$(du -bk $1)
+ SIZE=$(du -bk $1 | awk '{print $1}')
USIZE=$(expr $(cat $1 | $DECOMPRESS -dc | wc -c) / 1024)
REQUIRED=$($DECOMPRESS -dc $1 | tar -xO install/slack-required 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
CONFLICTS=$($DECOMPRESS -dc $1 | tar -xO install/slack-conflicts 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
- SUGGESTS=$($DECOMPRESS -dc | tar -xO install/slack-suggests 2>/dev/null|xargs -r )
+ SUGGESTS=$($DECOMPRESS -dc $1 | tar -xO install/slack-suggests 2>/dev/null|xargs -r )
METAFILE=${NAME%$PKGEXT}meta
echo "PACKAGE NAME: $NAME" > $LOCATION/$METAFILE
if [ -n "$DL_URL" ]; then
@@ -417,7 +417,7 @@
echo "PACKAGE CONFLICTS: $CONFLICTS" >> $LOCATION/$METAFILE
echo "PACKAGE SUGGESTS: $SUGGESTS" >> $LOCATION/$METAFILE
echo "PACKAGE DESCRIPTION:" >> $LOCATION/$METAFILE
- $DECOMPRESS -dc | tar -xO install/slack-desc |grep -E '\w+\:'|grep -v '^#' >> $LOCATION/$METAFILE
+ $DECOMPRESS -dc $1 | tar -xO install/slack-desc |grep -E '\w+\:'|grep -v '^#' >> $LOCATION/$METAFILE
echo "" >> $LOCATION/$METAFILE
}