add the tailscale repo in

tuxecure · Apr 20, 2024 · 4da5bc3 · 4da5bc3
1 parent 8c20bde
commit 4da5bc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/bin b/bin
diff --git a/crackle b/crackle
@@ -202,9 +202,6 @@ APT_CACHE="apt-cache -o Dir::Cache=$APTCACHE -o Dir::State=$APTSTATE -o Dir::Etc
 	sudo -k;
     }
 
-    [[ -d "$PKG_PREFIX/lib/crackle" ]] || mkdir -p "$PKG_PREFIX/lib/crackle";
-
-    cp -r "$SCRP_DIR"/bin/* "$PKG_PREFIX/lib/crackle"
     if ! check_cmd patchelf; then "$SCRP_DIR"/crackle install patchelf; fi
     [ ! -d $SCRP_DIR/.git ] && rm -r $SCRP_DIR;
     say "Setup complete!";

diff --git a/lib/pkgfunc b/lib/pkgfunc
@@ -68,10 +68,16 @@ function pkgsetup(){
         mkdir -p "$DPKGSTATE";
         cp /var/lib/dpkg/status $DPKGSTATE/status;
     }
+
+    [[ -d "$PKG_PREFIX/lib/crackle" ]] || mkdir -p "$PKG_PREFIX/lib/crackle";
+
+    cp -r "$SCRP_DIR"/bin/* "$PKG_PREFIX/lib/crackle"
+
     [[ -d "$APTCACHE" ]] || mkdir -p "$APTCACHE";
     [[ -d "$APTSTATE" ]] || mkdir -p "$APTSTATE";
     [[ -d "$APTCONFIG" ]] || {
-        mkdir -p $APTCONFIG/sources.list.d $APTCONFIG/preferences.d $APTCONFIG/trusted.gpg.d;
+        mkdir -p $APTCONFIG/preferences.d $APTCONFIG/trusted.gpg.d;
+        mv $PKG_PREFIX/lib/crackle/etc/sources.list.d $APTCONFIG;
         ln -s /etc/apt/sources.list $APTCONFIG;
         [[ -n "$(ls /etc/apt/trusted.gpg.d)" ]] && ln -s /etc/apt/trusted.gpg.d/* $APTCONFIG/trusted.gpg.d/;
     }