[Apt-zip-devel] r60 - in trunk: . debian
Eddy Petrisor
eddyp-guest at costa.debian.org
Sun Jul 23 20:00:54 UTC 2006
Author: eddyp-guest
Date: 2006-07-23 20:00:53 +0000 (Sun, 23 Jul 2006)
New Revision: 60
Modified:
trunk/common.sh.in
trunk/debian/changelog
Log:
fix indentation
Modified: trunk/common.sh.in
===================================================================
--- trunk/common.sh.in 2006-06-05 19:45:29 UTC (rev 59)
+++ trunk/common.sh.in 2006-07-23 20:00:53 UTC (rev 60)
@@ -1,6 +1,6 @@
# library file sourced by apt-zip-*
- APTZIPVERSION=#will be filled at package build time
+APTZIPVERSION=#will be filled at package build time
export APTZIPVERSION
CONFFILE=/etc/apt/apt-zip.conf
@@ -46,8 +46,7 @@
-o, --options=LIST List of options
-a, --aptgetaction=ACTION
Action ACTION done by apt-get
- -p, --packages=LIST
- List of extra packages to install
+ -p, --packages=LIST List of extra packages to install
-A, --accept=LIST List of accepted protocols for download (http,ftp,..)
-R, --reject=LIST List of rejected protocols for download (file,cdrom,..)
-z, --zipopt-file=FILENAME
@@ -80,7 +79,7 @@
FILTER="${SHAREDIR}/methods/$METHOD"
if [ ! -x "$FILTER" ]
then
- error "No $METHOD method installed."
+ error "No $METHOD method installed."
fi
}
@@ -309,43 +308,43 @@
{
if [ "$SKIPMOUNT" = no ]
then
- # Maybe mount removable medium
- MNTENTRY=$(mount | egrep "^[^ ]+ on $MEDIUM type ")
- if [ "$MNTENTRY" ]
- then
- WAS_MOUNTED=1
- if mount | grep "${MEDIUM}.*[(,]ro[,)]" >/dev/null
+ # Maybe mount removable medium
+ MNTENTRY=$(mount | egrep "^[^ ]+ on $MEDIUM type ")
+ if [ "$MNTENTRY" ]
then
- error "$MEDIUM is mounted READ ONLY"
- fi
- else
- WAS_MOUNTED=0
- echo "Mounting $MEDIUM"
- local out=$(env LC_ALL=C mount $MEDIUM 2>&1)
- if [ "$out" != "" ]
- then
- if echo $out | grep "write-protected" >/dev/null
- then
- error "$MEDIUM is write-protected"
+ WAS_MOUNTED=1
+ if mount | grep "${MEDIUM}.*[(,]ro[,)]" >/dev/null
+ then
+ error "$MEDIUM is mounted READ ONLY"
+ fi
else
- error $out
+ WAS_MOUNTED=0
+ echo "Mounting $MEDIUM"
+ local out=$(env LC_ALL=C mount $MEDIUM 2>&1)
+ if [ "$out" != "" ]
+ then
+ if echo $out | grep "write-protected" >/dev/null
+ then
+ error "$MEDIUM is write-protected"
+ else
+ error $out
+ fi
+ fi
fi
- fi
fi
- fi
}
az_umount()
{
if [ "$SKIPMOUNT" = no ]
then
- # Maybe umount removable medium
- if [ "$WAS_MOUNTED" = 0 ]
- then
- echo "UnMounting $MEDIUM"
- umount "$MEDIUM"
+ # Maybe umount removable medium
+ if [ "$WAS_MOUNTED" = 0 ]
+ then
+ echo "UnMounting $MEDIUM"
+ umount "$MEDIUM"
+ fi
fi
- fi
}
az_exit()
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-06-05 19:45:29 UTC (rev 59)
+++ trunk/debian/changelog 2006-07-23 20:00:53 UTC (rev 60)
@@ -1,6 +1,6 @@
apt-zip (0.16) UNRELEASED; urgency=low
- *
+ * more indenting improvement in common.sh.in file
-- Eddy Petrișor <eddy.petrisor at gmail.com> Mon, 5 Jun 2006 22:44:21 +0300
More information about the apt-zip-devel
mailing list