File tree Expand file tree Collapse file tree 3 files changed +16
-12
lines changed Expand file tree Collapse file tree 3 files changed +16
-12
lines changed Original file line number Diff line number Diff line change @@ -53,6 +53,17 @@ script_check()
53
53
return 1
54
54
}
55
55
56
+ script_info ()
57
+ {
58
+ script_check
59
+
60
+ if [ $? -eq 1 ] ; then
61
+ local info_je=$( jetson_release)
62
+ local je_version=$( echo $info_je | grep -Po ' (?<=Jetson Easy v)[^;]+' )
63
+ echo " - Update jetson_easy from $je_version to $JETSON_EASY_VERSION "
64
+ fi
65
+ }
66
+
56
67
script_run ()
57
68
{
58
69
tput setaf 6
Original file line number Diff line number Diff line change @@ -110,12 +110,12 @@ script_load_default()
110
110
111
111
script_save ()
112
112
{
113
- if [ ! -z ${NEW_GIT_USERNAME+x} ] ; then
113
+ if [ ! -z ${NEW_GIT_USERNAME+x} ] && [ ! -z $NEW_GIT_USERNAME ] ; then
114
114
# if [ NEW_GIT_USERNAME != $(git config user.name) ] ; then
115
115
echo " NEW_GIT_USERNAME=\" $NEW_GIT_USERNAME \" " >> $1
116
116
# fi
117
117
fi
118
- if [ ! -z ${NEW_GIT_EMAIL+x} ] ; then
118
+ if [ ! -z ${NEW_GIT_EMAIL+x} ] && [ ! -z $NEW_GIT_EMAIL ] ; then
119
119
echo " NEW_GIT_EMAIL=\" $NEW_GIT_EMAIL \" " >> $1
120
120
fi
121
121
}
@@ -136,12 +136,9 @@ script_info()
136
136
137
137
set_user_name ()
138
138
{
139
- # Load default user
140
- script_load_user
141
-
142
139
local NEW_GIT_USERNAME_TMP_VALUE
143
140
NEW_GIT_USERNAME_TMP_VALUE=$( whiptail --inputbox " $MODULE_NAME - Set user name" 8 78 $NEW_GIT_USERNAME --title " Set user.name" 3>&1 1>&2 2>&3 )
144
- exitstatus=$?
141
+ local exitstatus=$?
145
142
if [ $exitstatus = 0 ] ; then
146
143
# Write the new workspace
147
144
NEW_GIT_USERNAME=$NEW_GIT_USERNAME_TMP_VALUE
@@ -150,12 +147,9 @@ set_user_name()
150
147
151
148
set_email ()
152
149
{
153
- # Load default email
154
- script_load_email
155
-
156
150
local NEW_GIT_EMAIL_TMP_VALUE
157
151
NEW_GIT_EMAIL_TMP_VALUE=$( whiptail --inputbox " $MODULE_NAME - Set user email" 8 78 $NEW_GIT_EMAIL --title " Set user.email" 3>&1 1>&2 2>&3 )
158
- exitstatus=$?
152
+ local exitstatus=$?
159
153
if [ $exitstatus = 0 ]; then
160
154
# Write the new workspace
161
155
NEW_GIT_EMAIL=$NEW_GIT_EMAIL_TMP_VALUE
Original file line number Diff line number Diff line change @@ -292,8 +292,7 @@ script_save()
292
292
fi
293
293
294
294
if [ ! -z ${DP_FOLDER+x} ] ; then
295
- if [ $DP_FOLDER != " \"\" " ]
296
- then
295
+ if [ $DP_FOLDER != " \"\" " ] ; then
297
296
echo " DP_FOLDER=\" $DP_FOLDER \" " >> $1
298
297
fi
299
298
fi
You can’t perform that action at this time.
0 commit comments