ufak dokunuşlar

inary-cli

@@ -15,6 +15,7 @@
 import errno
 import traceback
 import signal
+import os
 import sys
 import traceback
 
@@ -92,7 +93,7 @@ def handle_exception(exception, value, tb):
 
 def blc_wsl():
     """Dont allow fucking WSL"""
-    f = open("/proc/version", "r").readline()
+    f = str(os.uname())
     if (("Microsoft" in f) or ("WSL" in f)):
         print(_("Using inary in WSL environment is not allowed."))
         exit()

scripts/inary-sandbox

@@ -31,7 +31,7 @@ def run(cmd, ignore_error=False):
 def create_sandbox(output_dir, repository):
     try:
         # Add repository of the packages
-        run('inary --yes-all --destdir="%s" add-repo pardus %s' % (output_dir, repository))
+        run('inary --yes-all --destdir="%s" add-repo sulin %s' % (output_dir, repository))
 
         # Install system.base and system.devel
         run('inary --yes-all --ignore-file-conflicts -D"%s" it -c system.base -c system.devel' % output_dir)
@@ -71,10 +71,12 @@ def mount_sandbox():
     run("mount -t tmpfs -o size=1024M,mode=0744 tmpfs tmpfs/")
     run("mkdir -p sandbox")
     run("mount -t aufs -o br=tmpfs=rw:base=ro none sandbox/")
-    run('/bin/mount --bind /proc sandbox/proc')
-    run('/bin/mount --bind /dev sandbox/dev')
+    run('/bin/mount -t proc proc sandbox/proc')
+    run('/bin/mount -t devtmpfs dev sandbox/dev')
+    run('/bin/mount -t sys sys sandbox/sys')
 
 def umount_sandbox():
+    run('/bin/umount sandbox/sys')
     run('/bin/umount sandbox/dev')
     run('/bin/umount sandbox/proc')
     run('/bin/umount sandbox')

scripts/mkdeb

+#!/bin/bash
+export CWD=$(pwd)
+tmp=$(mktemp)
+rm -f $tmp ; mkdir $tmp
+cd $1
+[ -d ./DEBIAN ] || echo "DEBIAN directory not found" && exit 1
+export NAME=$(cat DEBIAN/control | grep "Package: " | sed "s/.*: //g")
+export ARCH=$(cat DEBIAN/control | grep "Architecture: " | sed "s/.*: //g")
+export VERS=$(cat DEBIAN/control | grep "Version: " | sed "s/.*: //g")
+tar czvf $tmp/data.tar.gz [a-z]* | sed "s/^/Adding: /g"
+cd DEBIAN
+tar czf $tmp/control.tar.gz *
+cd ../..
+echo 2.0 > $tmp/debian-binary
+cd $tmp
+ar r "${NAME}_${ARCH}_${VERS}.deb" debian-binary control.tar.gz data.tar.gz
+mv $tmp/*.deb $CWD/
+rm -rf $tmp/
+cd $CWD

scripts/revdep-rebuild

@@ -179,8 +179,9 @@ else
 		if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" \
 		ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" |
 			$SONAME_GREP -q "$SONAME_SEARCH" ; then
-			echo "$FILE" >>$LLIST.3_rebuild
+			
 			echo_v "  broken $FILE (requires $(ldd "$FILE" | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))"
+			echo "  broken $FILE (requires $(ldd "$FILE" | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))" >>$LLIST.3_rebuild
 		fi
 		else
 		echo "$FILE" >>$LLIST.3_rebuild

scripts/revdep-rebuild-devel

+export PKG_CONFIG_PATH=/usr/lib32/pkgconfig:$PKG_CONFIG_PATH
+for j in {/usr/lib/pkgconfig,/usr/lib32/pkgconfig,/usr/share/pkgconfig}
+do
+	echo -e "\033[32;1mChecking \033[;0m$j"
+	for i in $(ls $j | sed "s/.pc//g")
+	do
+		[ -f $j/$i.pc ] && pkg-config --cflags --libs $i >/dev/null | sed '/^$/d' || true
+	done
+done

scripts/sulinstrapt

@@ -21,8 +21,8 @@ then
   echo "$sulin is a file. You must delete or move."
   exit 1
 fi
-inary ar sulin https://master.dl.sourceforge.net/project/sulinos/SulinRepository/inary-index.xml -D$sulin
-inary ur -D$sulin
+inary ar sulin https://master.dl.sourceforge.net/project/sulinos/SulinRepository/inary-index.xml -y -D$sulin
+inary ur -y -D$sulin
 inary it baselayout --ignore-dep --ignore-safety --ignore-configure -y -D$sulin 
 inary it -c system.base -y --ignore-configure -D$sulin
 if echo $2 | grep "^-" &>/dev/null ; then
@@ -32,7 +32,7 @@ if echo $2 | grep "^-" &>/dev/null ; then
 	echo $2 | grep "n" && inary it NetworkManager -y --ignore-configure -D$sulin
 	echo $2 | grep "a" && inary it nano wget vim strace ntfsprogs tree dialog pfork scom htop -y --ignore-configure -D$sulin
 fi
-for i in /dev /sys /proc
+for i in /dev /sys /proc /run
 do
 	mkdir -p $sulin/$i &>/dev/null
 	mount --bind $i $sulin/$i

setup.py

@@ -207,6 +207,12 @@ setup(name="inary",
                'scripts/revdep-rebuild',
                'scripts/sulinstrapt',
                'scripts/makepkg',
+               'scripts/mkdeb',
+               'scripts/revdep-rebuild-devel',
+               'scripts/inary-sandbox',
+               'scripts/inarysh',
+               'scripts/lsinary',
+               'scripts/uninary',
                'scripts/update-inary-cache',
                'scripts/version-bump'],
       classifiers=[