Dev (#157)

* Bring the main branch inline with dev (#152)

* Vortimo debian package and chrome extenstion bootstrap (#130)

Co-authored-by: lowprivshighhopes <lowprivshighhopes>

* remove incorrect vortimo install

* check requirements after update twayback

* Update kali.list.chroot

VirtualBox packages are breaking ISO install.

Co-authored-by: lowprivshighhopes <7492877+lowprivshighhopes@users.noreply.github.com>
Co-authored-by: Tom <48766856+humandecoded@users.noreply.github.com>
Co-authored-by: Tom <tom@humandecoded.io>

* remove memtest86+ from lb

* fixed updater typo

* changed update twayback

* updated obsidian version

* comment out vbox packages

* added pimeyes bookmark

* updated bookmark export

* updated guides

* remove old guide

---------

Co-authored-by: Jason Kregting <23207476+5nacks@users.noreply.github.com>
Co-authored-by: lowprivshighhopes <7492877+lowprivshighhopes@users.noreply.github.com>

build_tracelabsiso_recipe.sh

@@ -124,6 +124,8 @@ function tlosint-install {
 		#sed -i '177s/.*/#exit 1/' /opt/live-build-config/build.sh
 		#sed -i '182s/.*/#exit 1/' /opt/live-build-config/build.sh
 		#sed -i '181s/.*/#exit 1/' /opt/live-build-config/build.sh
+		# fix memtest error, setting to none
+		sed -i 's/--memtest memtest86+/--memtest none/g' $kali_path/auto/config
 		$kali_path/build.sh --verbose --variant tracelabs
 		#rm -f kali-archive-keyring_2020.2_all.deb
 		# restore original apt settings

kali-config/common/hooks/normal/osint-packages.chroot

@@ -138,8 +138,8 @@ rm /etc/xdg/menus/applications-merged/kali-applications.menu
 
 # Install Obsidian app image
 mkdir /usr/share/obsidian
-wget -O /usr/share/obsidian/Obsidian-0.15.9.AppImage https://github.com/obsidianmd/obsidian-releases/releases/download/v0.15.9/Obsidian-0.15.9.AppImage 
-chmod +x /usr/share/obsidian/Obsidian-0.15.9.AppImage
+wget -O /usr/share/obsidian/Obsidian-1.0.3.AppImage https://github.com/obsidianmd/obsidian-releases/releases/download/v1.0.3/Obsidian-1.0.3.AppImage 
+chmod +x /usr/share/obsidian/Obsidian-1.0.3.AppImage
 
 
 

kali-config/common/includes.chroot/usr/share/firefox-esr/distribution/distribution.ini

@@ -684,6 +684,9 @@ item.314.link=http://metapicz.com
 item.314.icon=http://metapicz.com/images/metapicz-favicon.ico
 item.314.iconData=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIklEQVQ4jWP4PZXhPyWYYdSAUQNGDYAYcKaB4T8leOANAAAj8oJf22OluAAAAABJRU5ErkJggg==
 
+item.315.title=Pimeyes
+item.315.link=https://pimeyes.com
+
 [BookmarksFolder-144]
 
 item.320.title=Bing Video

kali-config/variant-tracelabs/package-lists/kali.list.chroot

@@ -27,9 +27,6 @@ golang
 python3
 python3-pip
 build-essential
-#python2.7-dev
-#python2
-#python-pip
 curl
 python-argparse
 build-essential

updater-current.sh

@@ -234,10 +234,10 @@ tput setaf 5;echo "[+] Updating Twayback..."
 {
   if [ -d "/usr/share/twayback" ]; then        
     cd /usr/share/twayback
-    sudo git pull https://github.com/Mennaruuk/twayback.git --rebase
+    sudo git pull https://github.com/humandecoded/twayback.git --rebase
 	pip install -r requirements.txt
   else
-	sudo git clone https://github.com/Mennaruuk/twayback.git /usr/share/twayback
+	sudo git clone https://github.com/humandecoded/twayback.git /usr/share/twayback
 	cd /usr/share/twayback
 	pip install -r requirements.txt
   fi
@@ -246,13 +246,13 @@ tput setaf 2;echo "[+] Done."
 
 tput setaf 5;echo "[+] Updating yt-dlp..."
 {
-  pip install --updgrade yt-dlp
+  pip install --upgrade yt-dlp
 }
 tput setaf 2;echo "[+] Done."
 
 tput setaf 5;echo "[+] Updating youtube-dl..."
 {
-  pip install --updgrade youtube-dl
+  pip install --upgrade youtube-dl
 }
 tput setaf 2;echo "[+] Done."
 ############################