Update 'README.md'

README.md

@@ -2,17 +2,6 @@
 
 A Debian repository management tool.
 
-## Development
-__Warning! This software is still under development and is not intended for stable use.__
-
-### Todo
-- [x] finish add feature
-- [x] create del feature
-- [ ] multiple repositories feature
-- [ ] multiple archs feature
-- [x] signing repositories using GPG
-- [ ] make simple way to edit repository info in release file
-
 ## About
 `Debrepo` is a software tool designed for creating and managing Debian repositories for `*.deb` packages, providing a lightweight and user-friendly alternative to more complex tools like `reprepo` or `aptly`. While these alternatives may offer more advanced features, Debrepo focuses on providing essential functionality and ease of use for repository management, allowing users to easily add, remove, and update packages within their repositories. With Debrepo, users can efficiently manage their Debian repositories without the unnecessary complexity of more advanced tools.
 
@@ -20,11 +9,13 @@ __Warning! This software is still under development and is not intended for stab
 `sh` `dpkg` `gpg` `python3`
 
 ## Installation
-### from deb package
-- Todo
-
 ### from source
-- Todo
+- clone this repository to some folder inside your file system
+- make symlink to `/bin/`
+- now you should be able to use `debrepo`
+
+### from deb package
+- *Todo*
 
 ## How to use
 ```

debrepo

@@ -1,10 +1,13 @@
 #!/bin/sh
-VERSION="1.0.0"
+VERSION="0.1.0"
-DIR="$(cd "$(dirname "$0")" && pwd)" # location of debrepo source path
+#DIR="$(cd "$(dirname "$0")" && pwd)" # location of debrepo source path
+SCRIPT_PATH=$(readlink -f "$0")
+DIR=$(dirname "$SCRIPT_PATH")
 
 # set vars
 index=1
 for arg in $@; do
+	# set REPODIR variable
 	if [ $arg = "--repodir" ]; then
 		ARGID="$((index+1))"
 		eval "REPODIR=\$$ARGID"
@@ -15,11 +18,6 @@ for arg in $@; do
 		eval "GPG=\$$ARGID"
 	fi
 
-	if [ $arg = "--distro" ]; then
-		ARGID="$((index+1))"
-		eval "DISTRO=\$$ARGID"
-	fi
-
 	index=$((index+1))
 done
 
@@ -35,26 +33,32 @@ if [ "$1" = "init" ] || [ "$1" = "-i" ] || [ "$1" = "--init" ]; then
 fi
 
 if [ "$1" = "add" ] || [ "$1" = "-a" ] || [ "$1" = "--add" ]; then
-	# if distro specific package
+	if [ "$2" = "--letter-based-structure" ] || [ "$2" = "-l" ]; then
-	if [ "$DISTRO" ]; then
+		# generate package file name and copy deb file
-		echo "distro: $DISTRO"
+		PKG=$3
+		PKG_ARCH=$(dpkg -I $PKG | grep "Architecture" | sed 's/ Architecture: //')
+		PKG_VERSION=$(dpkg -I $PKG | grep "Version" | sed 's/ Version: //')
+		PKG_NAME=$(echo "$PKG" | sed 's/.*\///' | awk -F "_" '{print $1}')
+		PKG_FULLNAME="${PKG_NAME}_${PKG_VERSION}_${PKG_ARCH}.deb"
+		FIRST_LETTER=$(echo "$PKG" | sed 's/.*\///' | cut -c 1 | tr '[:upper:]' '[:lower:]')
+		PKG_PATH="$REPODIR/apt-repo/pool/main/$FIRST_LETTER/$PKG_NAME/$PKG_FULLNAME"
 
-		exit
+		mkdir -p "$REPODIR/apt-repo/pool/main/$FIRST_LETTER/$PKG_NAME/"
-	fi
+		cp $PKG $PKG_PATH
-	exit
-	# copy deb file to repo folder structure
-	if [ "$2" = "--letter-based-structure" ] || [ "$2" = "-l" ];then
-		first_letter=$(echo "$3" | sed 's/.*\///' | cut -c 1 | tr '[:upper:]' '[:lower:]')
-		pkg_name=$(echo "$3" | sed 's/.*\///' | awk -F "_" '{print $1}')
-		mkdir -p "$REPODIR/apt-repo/pool/main/$first_letter/$pkg_name/"
-		cp "$3" "$REPODIR/apt-repo/pool/main/$first_letter/$pkg_name/"
 	else
-		cp "$2" "$REPODIR/apt-repo/pool/main/"
+		# generate package file name and copy deb file
+		PKG=$2
+		PKG_ARCH=$(dpkg -i $PKG | grep "Architecture" | sed 's/ Architecture: //')
+		PKG_VERSION=$(dpkg -I $PKG | grep "Version" | sed 's/ Version: //')
+		PKG_NAME=$(echo "$PKG" | sed 's/.*\///' | awk -F "_" '{print $1}')
+		PKG_FULLNAME="${$PKG_NAME}_${PKG_VERSION}_${PKG_ARCH}.deb"
+
+		cp $PKG "$REPODIR/apt-repo/pool/main/$PKG_FULNAME"
 	fi
 
 	# generate package and release file
-	$DIR/scripts/genPkgRel.sh $REPODIR $2 $DISTRO  && echo "debrepo: package $2 was successfully added"
+	$DIR/scripts/genPkgRel.sh $REPODIR && echo "debrepo: package $PKG_FULLNAME was successfully added"
-	$DIR/scripts/gpgSign.sh $REPODIR $GPG $DISTRO && echo "debrepo: repo was succesfully signed"
+	$DIR/scripts/gpgSign.sh $REPODIR && echo "debrepo: repo was succesfully signed"
 	exit
 fi
 

scripts/genPkgRel.sh

@@ -1,22 +1,20 @@
 #!/bin/sh
+#DIR="$(cd "$(dirname "$0")" && pwd)"
+SCRIPT_PATH=$(readlink -f "$0")
+DIR=$(dirname "$SCRIPT_PATH")
 LS="$(which ls)" # this prevents bugs when aliasing ls to tools like exa
-DIR="$(cd "$(dirname "$0")" && pwd)"
 REPODIR="$1"
-DISTRO="$3"
+ARCHS="$($LS -l $REPODIR/apt-repo/dists/stable/main/ | awk '{print $9}' | awk NF | awk -F - '{print $2}')"
-if [ !$DISTRO ]; then
-	DISTRO="stable"
-fi
-
-ARCHS="$($LS -l $REPODIR/apt-repo/dists/$DISTRO/main/ | awk '{print $9}' | awk NF | awk -F - '{print $2}')"
 
 # generate Packages file
+cd $REPODIR/apt-repo/
 for ARCH in $ARCHS; do
-	dpkg-scanpackages --multiversion --arch $ARCH "$REPODIR/apt-repo/pool/" > "$REPODIR/apt-repo/dists/$DISTRO/main/binary-$ARCH/Packages"
+	dpkg-scanpackages --multiversion --arch $ARCH "pool/" > "dists/stable/main/binary-$ARCH/Packages"
 	# compress Packages file
-	cat "$REPODIR/apt-repo/dists/$DISTRO/main/binary-$ARCH/Packages" | gzip -9 > "$REPODIR/apt-repo/dists/$DISTRO/main/binary-$ARCH/Packages.gz"
+	cat "dists/stable/main/binary-$ARCH/Packages" | gzip -9 > "dists/stable/main/binary-$ARCH/Packages.gz"
 done
 
 # generate Release file
-cd "$REPODIR/apt-repo/dists/$DISTRO/"
+cd "dists/stable/"
-$DIR/generate-release.sh $DISTRO > "Release"
+$DIR/generate-release.sh > "Release"
 

scripts/generate-release.sh

@@ -2,15 +2,6 @@
 set -e
 . ../../config # this file is in /apt-repo/config
 
-if [ ! $DISTRO ]; then
-	DISTRO="stable"
-fi
-
-if [ ! -f "../../config" ]; then
-	echo "error - config file does not exists"
-	exit 1;
-fi
-
 do_hash() {
     HASH_NAME=$1
     HASH_CMD=$2
@@ -24,11 +15,17 @@ do_hash() {
     done
 }
 
+if [ ! -f "../../config" ]; then
+	echo "error - config file does not exists"
+	exit 1;
+fi
+
+
 cat << EOF
 Origin: $ORIGIN
 Label: $LABEL
 Suite: $SUITE
-Codename: $DISTRO
+Codename: $CODENAME
 Version: $VERSION
 Architectures: $ARCHITECTURES
 Components: $COMPONENTS

scripts/gpgSign.sh

@@ -1,20 +1,17 @@
 #!/bin/sh
 REPODIR="$1"
-DISTRO="$3"
 . $REPODIR/apt-repo/config
 
-if [ ! $DISTRO ]; then
-	DISTRO="stable"
-fi
-
 if [ ! $DEFAULT_GPG ]; then
 	echo "error: no gpg key provided in config file"
 	exit 1
 fi
 
 KEY=$DEFAULT_GPG
+
+
 echo "debrepo: signing using $KEY"
 
-cat $REPODIR/apt-repo/dists/$DISTRO/Release | gpg --default-key $KEY -abs > $REPODIR/apt-repo/dists/$DISTRO/Release.gpg
+cat $REPODIR/apt-repo/dists/stable/Release | gpg --default-key $KEY -abs > $REPODIR/apt-repo/dists/stable/Release.gpg
-cat $REPODIR/apt-repo/dists/$DISTRO/Release | gpg --default-key $KEY -abs --clearsign > $REPODIR/apt-repo/dists/$DISTRO/InRelease
+cat $REPODIR/apt-repo/dists/stable/Release | gpg --default-key $KEY -abs --clearsign > $REPODIR/apt-repo/dists/stable/InRelease
 

scripts/repoinit.sh

@@ -9,21 +9,3 @@ fi
 mkdir -p $1/apt-repo/dists/stable/main/binary-amd64/
 mkdir -p $1/apt-repo/pool/main/
 
-# make config file
-echo \
-"#!/bin/sh
-
-# Repository preferences
-DEFAULT_GPG=\"\"
-
-# Repository info
-ORIGIN=\"example.com\"
-LABEL=\"example repository\"
-SUITE=\"stable\"
-CODENAME=\"stable\"
-VERSION=\"1.0\"
-ARCHITECTURES=\"amd64\"
-COMPONENTS=\"main\"
-DESCRIPTION=\"example repository\"
-" > $1/apt-repo/config
-