projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gnash fonctionnel. Ça prend absolument AGG pour que les vidéos fonctionnent (cairo...
[hvlinux.git]
/
functions
/
main
diff --git
a/functions/main
b/functions/main
index
25e1bcb
..
21f8a31
100644
(file)
--- a/
functions/main
+++ b/
functions/main
@@
-73,7
+73,7
@@
BRACKET="\033[1;34m"
TAR_OPTS="-b8"
# List of default archive extensions to try
TAR_OPTS="-b8"
# List of default archive extensions to try
-DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z zip"
+DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z
tar.xz
zip"
HV_FONTS_PATH="/usr/share/fonts"
HV_FONTS_PATH="/usr/share/fonts"
@@
-133,6
+133,11
@@
init_log_file()
# Scripts directory
export SCRDIR=$(pwd)
# Scripts directory
export SCRDIR=$(pwd)
+ if [ ! -d "$(dirname $(pwd))/packages" ]; then
+ echo "Error, could not find packages directory \"$(dirname $(pwd))/packages\", aborting."
+ exit 1
+ fi
+
export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
@@
-144,6
+149,15
@@
init_log_file()
fi
}
fi
}
+# Check that we are logged in as the root user, and exit if this is not the case.
+check_for_root_user()
+{
+ if [ "x${USER}" != "xroot" ]; then
+ echo "You must be the superuser to install hvlinux."
+ exit 1
+ fi
+}
+
# Extracting the version number from a complete package name.
# Arg. #1: Complete package name with version (ex: firefox-3.5.5.source will output 3.5.5)
get_pkg_ver()
# Extracting the version number from a complete package name.
# Arg. #1: Complete package name with version (ex: firefox-3.5.5.source will output 3.5.5)
get_pkg_ver()
@@
-653,7
+667,7
@@
static_decompressed_dirname()
local DIRNAME=""
case ${arch_ext} in
local DIRNAME=""
case ${arch_ext} in
- tar.bz2|tar.gz|tgz|tar.Z)
+ tar.bz2|tar.gz|tgz|tar.Z
|tar.xz
)
# Remove optional "./" leading component with sed
# and extract base directory name with awk.
# tar 1.23 reports an error when using pipes, so
# Remove optional "./" leading component with sed
# and extract base directory name with awk.
# tar 1.23 reports an error when using pipes, so
@@
-682,6
+696,7
@@
static_decompressed_dirname()
# Decompression of a package
# First argument: package name
# Second argument: directory where decompressing (optional, defaults to LFS_TMP)
# Decompression of a package
# First argument: package name
# Second argument: directory where decompressing (optional, defaults to LFS_TMP)
+# Third argument: directory levels to strip (optional)
decompress_package()
{
# Checking for correct number of arguments
decompress_package()
{
# Checking for correct number of arguments
@@
-689,8
+704,11
@@
decompress_package()
local TOPDIR=${LFS_TMP}
elif [ $# -eq 2 ]; then
local TOPDIR=${2}
local TOPDIR=${LFS_TMP}
elif [ $# -eq 2 ]; then
local TOPDIR=${2}
+ elif [ $# -eq 3 ]; then
+ local TOPDIR=${2}
+ local STRIP_LEVEL="--strip-components=${3}"
else
else
- echo "${FUNCNAME}(): Incorrect number of arguments (must be 1
or 2
)" > /dev/stderr
+ echo "${FUNCNAME}(): Incorrect number of arguments (must be 1
, 2 or 3
)" > /dev/stderr
return ${EXIT_FAILURE}
fi
return ${EXIT_FAILURE}
fi
@@
-707,17
+725,15
@@
decompress_package()
rm -rf ${TOPDIR}/${PACKAGE}
fi
rm -rf ${TOPDIR}/${PACKAGE}
fi
+
# Decompressing package
case ${arch_ext} in
# Decompressing package
case ${arch_ext} in
- tar.bz2)
- tar -C ${TOPDIR} ${TAR_OPTS} -jxf \
- ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext}
- ;;
- tar.gz|tgz|tar.Z)
- tar -C ${TOPDIR} ${TAR_OPTS} -zxf \
+ tar.bz2|tar.gz|tgz|tar.Z|tar.xz)
+ tar -C ${TOPDIR} ${TAR_OPTS} ${STRIP_LEVEL} -xf \
${LFS_PKG_DIR}/${PACKAGE}.${arch_ext}
;;
zip)
${LFS_PKG_DIR}/${PACKAGE}.${arch_ext}
;;
zip)
+ # Support STRIP_LEVEL???
unzip -qq -d ${TOPDIR} ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext}
;;
esac
unzip -qq -d ${TOPDIR} ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext}
;;
esac