Bundler updates
win and mac updates - self extracting archives, bundle requirements split
frdel committed
Oct 18, 2024 at 12:32 UTC
9da3bd5b2ea6bee40ddf31c45c6fb090607b5661
5 files changed
+71
-46
bundle/mac_pkg_scripts/postinstall
+8
-5
@@ -1,5 +1,8 @@
1
#!/bin/bash
2
3
+# Define the source path in the user's Library/Application Support
4
+SOURCE_PATH="$HOME/Library/Application Support/agent-zero/install"
5
+
6
# Prompt the user to select a folder using an AppleScript dialog
7
TARGET_FOLDER=$(osascript <<EOT
8
tell application "System Events"
@@ -15,15 +18,15 @@ if [ -n "$TARGET_FOLDER" ]; then
18
echo "Installing files to $TARGET_FOLDER"
19
20
# Move the installed files to the selected folder
18
- mv /tmp/agent-zero/* "$TARGET_FOLDER"
21
+ mv "$SOURCE_PATH"/* "$TARGET_FOLDER"
22
23
# Check if the move operation was successful
24
if [ $? -eq 0 ]; then
25
echo "Files successfully moved to $TARGET_FOLDER"
26
24
- # Remove the /tmp/agent-zero folder
25
- rm -rf /tmp/agent-zero
26
- echo "/tmp/agent-zero folder removed."
27
+ # Remove the agent-zero folder in Library/Application Support
28
+ rm -rf "$SOURCE_PATH"
29
+ echo "$SOURCE_PATH folder removed."
30
else
31
echo "Error moving files. Exiting."
32
exit 1
@@ -33,4 +36,4 @@ else
36
exit 1
37
fi
38
36
-exit 0
\ No newline at end of file
39
+exit 0
bundle/macos_bundle.sh
+29
-21
@@ -22,35 +22,41 @@ if [ $? -ne 0 ]; then
22
exit 1
23
fi
24
25
-# 3. Purge folder ./agent-zero (retry mechanism in case of failure)
26
-if [ -d "agent-zero" ]; then
27
- echo "Deleting agent-zero folder..."
28
- rm -rf agent-zero
29
- if [ -d "agent-zero" ]; then
30
- echo "Error: Unable to delete agent-zero folder, retrying..."
25
+# 3. Purge folder ./agent-zero-git (retry mechanism in case of failure)
26
+if [ -d "agent-zero-git" ]; then
27
+ echo "Deleting agent-zero-git folder..."
28
+ rm -rf agent-zero-git
29
+ if [ -d "agent-zero-git" ]; then
30
+ echo "Error: Unable to delete agent-zero-git folder, retrying..."
31
sleep 3
32
- rm -rf agent-zero
32
+ rm -rf agent-zero-git
33
fi
34
- if [ -d "agent-zero" ]; then
35
- echo "Error: Failed to purge agent-zero folder after retry."
34
+ if [ -d "agent-zero-git" ]; then
35
+ echo "Error: Failed to purge agent-zero-git folder after retry."
36
exit 1
37
fi
38
fi
39
40
# 4. Clone the repository (development branch)
41
echo "Cloning the repository (development branch)..."
42
-git clone --branch development https://github.com/frdel/agent-zero agent-zero
42
+git clone --branch development https://github.com/frdel/agent-zero agent-zero-git
43
if [ $? -ne 0 ]; then
44
echo "Error cloning the repository."
45
exit 1
46
fi
47
48
# 5. Change directory to agent-zero
49
-cd agent-zero || { echo "Error changing directory"; exit 1; }
49
+# cd agent-zero || { echo "Error changing directory"; exit 1; }
50
51
# 6. Install requirements
52
echo "Installing requirements from requirements.txt..."
53
-pip install -r requirements.txt
53
+pip install -r ./agent-zero-git/requirements.txt
54
+if [ $? -ne 0 ]; then
55
+ echo "Error installing requirements."
56
+ exit 1
57
+fi
58
+
59
+pip install -r ./agent-zero-git/bundle/requirements.txt
60
if [ $? -ne 0 ]; then
61
echo "Error installing requirements."
62
exit 1
@@ -61,7 +67,7 @@ fi
67
68
# 8. Run bundle.py
69
echo "Running bundle.py..."
64
-python ./bundle/bundle.py
70
+python ./agent-zero-git/bundle/bundle.py
71
if [ $? -ne 0 ]; then
72
echo "Error running bundle.py."
73
exit 1
@@ -84,22 +90,24 @@ fi
90
91
# 9. Create macOS package
92
echo "Creating macOS package..."
87
-pkgbuild --root ./dist/agent-zero \
93
+pkgbuild --root ./agent-zero-git/bundle/dist/agent-zero \
94
--identifier frdel.agent-zero \
89
- --install-location /tmp/agent-zero \
90
- --scripts ./mac_pkg_scripts \
95
+ --install-location "$HOME/Library/Application Support/agent-zero/install" \
96
+ --scripts ./agent-zero-git/bundle/mac_pkg_scripts \
97
+ --ownership preserve \
98
agent-zero-preinstalled-mac-m1.pkg
99
+
100
if [ $? -ne 0 ]; then
101
echo "Error creating macOS package."
102
exit 1
103
fi
104
97
-# 10. Remove the agent-zero folder
98
-echo "Deleting agent-zero folder..."
105
+# 10. Remove the agent-zero-git folder
106
+echo "Deleting agent-zero-git folder..."
107
cd ..
100
-rm -rf agent-zero
101
-if [ -d "agent-zero" ]; then
102
- echo "Error: Failed to delete agent-zero folder."
108
+rm -rf agent-zero-git
109
+if [ -d "agent-zero-git" ]; then
110
+ echo "Error: Failed to delete agent-zero-git folder."
111
exit 1
112
fi
113
bundle/requirements.txt
new
+3
@@ -0,0 +1,3 @@
1
+pathspec==0.12.1
2
+py7zr==0.22.0
3
+pyinstaller==6.10.0
\ No newline at end of file
bundle/windows_bundle.bat
+31
-17
@@ -56,38 +56,44 @@ if %errorlevel% neq 0 (
56
)
57
58
:: 3. Purge folder ./agent-zero (retry mechanism in case of failure)
59
-if exist agent-zero (
60
- echo Deleting agent-zero folder...
61
- rmdir /s /q agent-zero
62
- if exist agent-zero (
63
- echo Error: Unable to delete agent-zero folder, retrying...
59
+if exist agent-zero-git (
60
+ echo Deleting agent-zero-git folder...
61
+ rmdir /s /q agent-zero-git
62
+ if exist agent-zero-git (
63
+ echo Error: Unable to delete agent-zero-git folder, retrying...
64
timeout /t 3 /nobreak >nul
65
- rmdir /s /q agent-zero
65
+ rmdir /s /q agent-zero-git
66
)
67
- if exist agent-zero (
68
- echo Error: Failed to purge agent-zero folder after retry.
67
+ if exist agent-zero-git (
68
+ echo Error: Failed to purge agent-zero-git folder after retry.
69
pause
70
)
71
)
72
73
-:: 4. Clone the repository (testing branch)
74
-git clone --branch testing https://github.com/frdel/agent-zero agent-zero
73
+:: 4. Clone the repository (development branch)
74
+git clone --branch development https://github.com/frdel/agent-zero agent-zero-git
75
if %ERRORLEVEL% neq 0 (
76
echo Error cloning the repository
77
pause
78
)
79
80
-:: 5. Change directory to agent-zero
81
-cd agent-zero
80
+@REM :: 5. Change directory to agent-zero
81
+@REM cd agent-zero
82
+@REM if %errorlevel% neq 0 (
83
+@REM echo Error changing directory
84
+@REM pause
85
+@REM )
86
+
87
+:: 6. Install requirements
88
+pip install -r ./agent-zero-git/requirements.txt
89
if %errorlevel% neq 0 (
83
- echo Error changing directory
90
+ echo Error installing project requirements
91
pause
92
)
93
87
-:: 6. Install requirements
88
-pip install -r requirements.txt
94
+pip install -r ./agent-zero-git/bundle/requirements.txt
95
if %errorlevel% neq 0 (
90
- echo Error installing requirements
96
+ echo Error installing bundle requirements
97
pause
98
)
99
@@ -99,11 +105,19 @@ if %errorlevel% neq 0 (
105
)
106
107
:: 8. Run bundle.py
102
-python ./bundle/bundle.py
108
+python ./agent-zero-git/bundle/bundle.py
109
if %errorlevel% neq 0 (
110
echo Error running bundle.py
111
pause
112
)
113
114
+:: 9. Create Windows self-extracting archive with 7-Zip
115
+echo Creating Windows self-extracting archive...
116
+"C:\Program Files\7-Zip\7z.exe" a -sfx"C:\Program Files\7-Zip\7z.sfx" agent-zero-preinstalled-win-x86.exe ".\agent-zero-git\bundle\dist\agent-zero" -mx=7
117
+if %errorlevel% neq 0 (
118
+ echo Error creating Windows self-extracting archive.
119
+ pause
120
+)
121
+
122
echo Script completed
123
pause
requirements.txt
-3
@@ -18,9 +18,6 @@ lxml_html_clean==0.3.1
18
markdown==3.7
19
newspaper3k==0.2.8
20
paramiko==3.4.0
21
-pathspec==0.12.1
22
-py7zr==0.22.0
23
-pyinstaller==6.10.0
21
pypdf==4.3.1
22
python-dotenv==1.0.1
23
sentence-transformers==3.0.1