Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=66b5ef35ee9e656fe89269e208bc58ea03dc7797
commit 66b5ef35ee9e656fe89269e208bc58ea03dc7797
Author: James Buren <r...@frugalware.org>
Date: Thu Nov 3 07:10:21 2011 -0500
Makefile: add fw32-run
diff --git a/Makefile b/Makefile
index 1db881f..a7b4a06 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ install: all
chmod +s $(DESTDIR)/usr/bin/fw32
ln -sf fw32 $(DESTDIR)/usr/bin/fw32-create
ln -sf fw32 $(DESTDIR)/usr/bin/fw32-delete
+ ln -sf fw32 $(DESTDIR)/usr/bin/fw32-run
ln -sf fw32 $(DESTDIR)/usr/bin/fw32-upgrade
ln -sf fw32 $(DESTDIR)/usr/bin/fw32-install
ln -sf fw32 $(DESTDIR)/usr/bin/fw32-remove
diff --git a/fw32 b/fw32
deleted file mode 100755
index 1bf04ea..0000000
--- a/fw32
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-FW32_ROOT="/usr/lib/fw32"
-FW32_CONFIG="/etc/fw32/pacman-g2.conf"
-FW32_DIRS=(
- '/proc'
- '/sys'
- '/dev'
- '/etc'
- '/home'
- '/tmp'
- '/var/tmp'
- '/var/cache/pacman-g2/pkg'
- '/usr/share/kde'
- '/usr/share/icons'
- '/usr/share/fonts'
- '/usr/share/themes'
-)
-
-error()
-{
- /usr/bin/echo "$1"
- exit 1
-}
-
-mount()
-{
- /usr/bin/grep -q "$FW32_ROOT/$1" /proc/mounts
- [ $? -eq 0 ] && return
- /bin/mount --bind "$1" "$FW32_ROOT/$1"
- [ $? -ne 0 ] && error "Failed to mount $1."
-}
-
-umount()
-{
- /bin/umount "$FW32_ROOT/$1"
- [ $? -ne 0 ] && error "Failed to umount $1."
-}
-
-mkdir()
-{
- /usr/bin/mkdir -p "$FW32_ROOT/$1"
- [ $? -ne 0 ] && "Failed to create directory $1."
-}
-
-pacman_g2()
-{
- /usr/bin/linux32 /usr/bin/pacman-g2 --noconfirm --root "$FW32_ROOT"
--config "$FW32_CONFIG" $@
- [ $? -ne 0 ] && error "pacman-g2 failed to perform its action."
-}
-
-run()
-{
- /usr/bin/linux32 /usr/sbin/chroot $FW32_ROOT $@
- [ $? -ne 0 ] && error "Failed to run command $@."
-}
-
-mount_all()
-{
- for i in ${FW32_DIRS[@]}; do
- mount $i
- done
-}
-
-umount_all()
-{
- for i in $(/usr/bin/grep -o -E "$FW32_ROOT/[a-zA-Z0-9_/]+"
/proc/mounts); do
- umount "$(/usr/bin/echo $i | /usr/bin/sed 's|^$FW32_ROOT||')"
- done
-}
-
-create()
-{
- [ -d "$FW32_ROOT" ] && error "$FW32_ROOT appears to already exist."
- for i in ${FW32_DIRS[@]}; do
- mkdir $i
- done
- mount /var/cache/pacman-g2/pkg
- pacman_g2 -Sy shadow coreutils findutils which wget file tar gzip bzip2
util-linux procps kbd psmisc less pacman-g2
- umount /var/cache/pacman-g2/pkg
- mount_all
-}
-
-update()
-{
- umount_all
- mount /var/cache/pacman-g2/pkg
- pacman_g2 -Syuf
- umount /var/cache/pacman-g2/pkg
- mount_all
- [ -x "$FW32_ROOT/usr/bin/fc-cache" ] && run /usr/bin/fc-cache --force
--system-only
-}
-
-delete()
-{
- umount_all
- rm -rf $FW32_ROOT
- [ $? -ne 0 ] && error "Failed to delete $FW32_ROOT."
-}
-
-clean()
-{
- mount_all
- pacman_g2 -Sc
-}
-
-install()
-{
- umount_all
- mount /var/cache/pacman-g2/pkg
- pacman_g2 -Syf $@
- umount /var/cache/pacman-g2/pkg
- mount_all
-}
-
-uninstall()
-{
- umount_all
- mount /var/cache/pacman-g2/pkg
- pacman_g2 -Rs $@
- umount /var/cache/pacman-g2/pkg
- mount_all
-}
-
-[ $UID -ne 0 ] && [ $EUID -ne 0 ] && error "You must run this command as root."
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
