Kaydet (Commit) d1cefa1c authored tarafından Ali Rıza KESKİN's avatar Ali Rıza KESKİN

directory safety fix

üst 5fa7a420
......@@ -2,7 +2,7 @@
run_function(){
fnc="$1"
if fn_exists "_$fnc" ; then
cd $WORKDIR
cd "$WORKDIR"
msg ">>> Running $fnc function"
_$fnc || fail_message "Failed to run $fnc function."
fi
......
#!/bin/bash
_fetch(){
cd $WORKDIR
cd "$WORKDIR"
for src in ${source[@]} ; do
if [ -f $CURDIR/$src ] ; then
info "Copying: $src"
......@@ -43,5 +43,5 @@ for src in ${source[@]} ; do
basename $src | grep ".tar.*" && tar -xf $(basename $src) || true
fi
done
cd $CURDIR
cd "$CURDIR"
}
#!/bin/bash
wsl_block(){
var=$(uname -r)
if [[ "$var" == *Microsoft* || "$var" == "*WSL*" ]]
[[ ! -f /proc/cpuinfo ]] && return 1
if [[ "$var" == "*Microsoft*" || "$var" == "*microsoft*" || "$var" == "*WSL*" ]] \
|| cat /proc/cpuinfo | grep "microcode" | grep "0xffffffff" &>/dev/null
then
exit 1
return 1
fi
}
......
......@@ -37,11 +37,11 @@ do
ldd $stuff | grep "=>" | awk '{print $3}' | while read line
do
if [ -f $line ] ; then
mkdir -p $PKGDIR/$line || true
rmdir $PKGDIR/$line || true
mkdir -p "$PKGDIR"/$line || true
rmdir "$PKGDIR"/$line || true
cat $line > $PKGDIR/$line || true
cat $(readlink -f $line) > $PKGDIR/$(readlink -f $line)
chmod +x $PKGDIR/$line
chmod +x "$PKGDIR/$line"
fi
done
done
......@@ -60,8 +60,8 @@ _package(){
wget -c https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$(uname -m).AppImage -O ~/.appimagekit
chmod +x ~/.appimagekit
fi
cp -prfv $INSTALLDIR/* $PKGDIR/
cp -prfv "$INSTALLDIR"/* "$PKGDIR"/
[ "${PORTABLE}" == "true" ] && find $INSTALLDIR | copy_library &> /dev/null || true
cd $CURDIR
ARCH=$(uname -m) ~/.appimagekit $PKGDIR
ARCH=$(uname -m) ~/.appimagekit "$PKGDIR"
}
......@@ -92,7 +92,7 @@ _create_metadata(){
_package(){
cp -prfv $INSTALLDIR/* $PKGDIR/
cd $PKGDIR
cd "$PKGDIR"
#Create .MTREE
list_package_files | LANG=C bsdtar -cnf - --format=mtree \
--options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
......
......@@ -23,28 +23,28 @@ echo -e "Description: $description\n"
_create_metadata(){
mkdir -p $PKGDIR/DEBIAN
mkdir -p "$PKGDIR/DEBIAN"
if [ -d "$debdir" ]; then
cp -prfv $debdir/* $PKGDIR/DEBIAN
else
_write_metadata > $PKGDIR/DEBIAN/control
fi
cd $INSTALLDIR/
cd "$INSTALLDIR"
find -type d | xargs chmod 755
find -type f -exec md5sum {} \; | sed "s|\./||g"> $PKGDIR/DEBIAN/md5sums
}
_package(){
if [ -f /var/lib/dpkg/status ] ; then
cp -prf $INSTALLDIR/* $PKGDIR/
dpkg -b $PKGDIR "$CURDIR/${name}_${arch}_${version}.deb"
cp -prf "$INSTALLDIR"/* "$PKGDIR"/
dpkg -b "$PKGDIR" "$CURDIR/${name}_${arch}_${version}.deb"
else
cd $INSTALLDIR
tar --xz -cvf $PKGDIR/data.tar.xz ./*
cd $PKGDIR/DEBIAN
tar --xz -cvf $PKGDIR/control.tar.xz *
echo "2.0" > $PKGDIR/debian-binary
cd $PKGDIR
cd "$INSTALLDIR"
tar --xz -cvf "$PKGDIR"/data.tar.xz ./*
cd "$PKGDIR/DEBIAN"
tar --xz -cvf "$PKGDIR"/control.tar.xz *
echo "2.0" > "$PKGDIR"/debian-binary
cd "$PKGDIR"
ar r "$CURDIR/${name}_${arch}_${version}.deb" debian-binary control.tar.xz data.tar.xz
fi
}
......
#!/bin/bash
__write_remove(){
cd $INSTALLDIR
cd "$INSTALLDIR"
find | sort | while read line
do
if [ -f $line ] ; then
......@@ -35,14 +35,14 @@ _create_metadata(){
echo "$dep" >> $PKGDIR/info/$name
done
echo "----files----" >> $PKGDIR/info/$name
cd $INSTALLDIR
cd "$INSTALLDIR"
find -type f | xargs md5sum >> $PKGDIR/info/$name
echo "----end----" >> $PKGDIR/info/$name
__write_remove >> $PKGDIR/info/$name.remove
}
_package(){
cp -prfv $INSTALLDIR/* $PKGDIR/
cd $PKGDIR
tar -cf $CURDIR/$name-$version.tar *
cp -prfv "$INSTALLDIR"/* $PKGDIR/
cd "$PKGDIR"
tar -cf "$CURDIR"/$name-$version.tar *
}
......@@ -63,7 +63,7 @@ _create_metadata(){
}
_package(){
cd $INSTALLDIR
cd "$INSTALLDIR"
[ -f ../install.tar.xz ] && rm -f ../install.tar.xz
tar --xz -cf ../install.tar.xz *
echo -e "<Files>" > ../files.xml
......@@ -84,9 +84,9 @@ _package(){
echo -e "</Files>" >> ../files.xml
mv ../files.xml $PKGDIR/files.xml
mv ../install.tar.xz $PKGDIR/install.tar.xz
cd $PKGDIR
cd "$PKGDIR"
export installtarhash="$(sha1sum install.tar.xz | awk '{print $1}')"
sed -i "s/@tarhash@/$installtarhash/g" metadata.xml
zip -r $CURDIR/$name-$version.inary *
zip -r "$CURDIR/$name-$version.inary" *
}
......@@ -38,7 +38,7 @@ _get_build_deps || warn "Failed to check dependencies."
declare -r checktime=$(date +%s%3N)
cd $BUILDDIR
cd "$BUILDDIR"
msg ">>> Getting sources"
_fetch || fail_message "Failed to get sources."
declare -r fetchtime=$(date +%s%3N)
......@@ -65,7 +65,7 @@ for package in ${PKGS[@]} ; do
export DESTDIR=$INSTALLDIR
mkdir -p $PKGDIR $INSTALLDIR
if fn_exists "_install" ; then
cd $WORKDIR
cd "$WORKDIR"
msg ">>> Running install function for $package"
_install || fail_message "Failed to run install function for $package"
fi
......@@ -81,17 +81,17 @@ for package in ${PKGS[@]} ; do
export PKGDIR=$BUILDDIR/$package/package
export INSTALLDIR=$BUILDDIR/$package/install
mkdir -p $PKGDIR $INSTALLDIR
cd $WORKDIR
cd "$WORKDIR"
msg ">>> Generating metadata"
_create_metadata
cd $WORKDIR
cd "$WORKDIR"
msg ">>> Creating package"
_package
done
declare -r packagetime=$(date +%s%3N)
msg ">>> Clearing workdir"
rm -rf $WORKDIR
rm -rf "$WORKDIR"
info ">>> Done"
msg "Unibuild stats (milisec):"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment